Skip to content

Commit dc29451

Browse files
committed
Update qml, nativeqt app for Qt6
:Release Notes: Udpate qml, nativeqt app for Qt6 :Detailed Notes: - webOS Qt version updated to Qt6 - Need to change sample's bb file and source code - Add opengl to .pro file
1 parent 25ada62 commit dc29451

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

native-apps/built-in/build-config/com.example.app.nativeqt.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PR = "r0"
1111
DEPENDS = "qtbase luna-service2 glib-2.0 libpbnjson"
1212

1313
inherit webos_submissions
14-
inherit webos_qmake5
14+
inherit webos_qmake6
1515
inherit webos_app
1616

1717
OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"

native-apps/built-in/com.example.app.nativeqt/MyOpenGLWindow.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
****************************************************************************/
5050

5151
#include "MyOpenGLWindow.h"
52-
#include <QtGui/QOpenGLContext>
53-
#include <QtGui/QOpenGLPaintDevice>
54-
#include <QtGui/QPainter>
52+
#include <QOpenGLContext>
53+
#include <QOpenGLPaintDevice>
54+
#include <QPainter>
5555

5656
MyOpenGLWindow::MyOpenGLWindow(QRect rect)
5757
: m_windowRect(rect)
@@ -90,7 +90,7 @@ void MyOpenGLWindow::render()
9090
font.setStyleHint(QFont::Helvetica, QFont::PreferAntialias);
9191

9292
painter.setFont(font);
93-
painter.setRenderHint(QPainter::HighQualityAntialiasing);
93+
painter.setRenderHint(QPainter::Antialiasing);
9494
painter.setPen(Qt::yellow);
9595
painter.drawText(rect, Qt::AlignCenter, "Hello, Native Qt Application!!");
9696

native-apps/built-in/com.example.app.nativeqt/com.example.app.nativeqt.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
TARGET = nativeqt
1818

1919
CONFIG += qt
20-
QT += core gui-private
20+
QT += core gui-private opengl
2121

2222
CONFIG += link_pkgconfig
2323
PKGCONFIG += luna-service2 glib-2.0 pbnjson_cpp PmLogLib

native-apps/built-in/com.example.app.nativeqt/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include "MyOpenGLWindow.h"
1818
#include "ServiceRequest.h"
19-
#include <QtGui/QGuiApplication>
20-
#include <QtGui/QWindow>
21-
#include <QtGui/QScreen>
19+
#include <QGuiApplication>
20+
#include <QWindow>
21+
#include <QScreen>
2222
#include <qpa/qplatformnativeinterface.h>
2323

2424
int main(int argc, char **argv)

qml-apps/build-config/com.example.app.qml.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += "qml-webos-framework qml-webos-bridge"
1111
WEBOS_VERSION="1.0.0"
1212
PR = "r0"
1313

14-
inherit webos_qmake5
14+
inherit webos_qmake6
1515
inherit webos_submissions
1616
inherit webos_app
1717

0 commit comments

Comments
 (0)