summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cmake.conf2
-rw-r--r--.qmake.conf2
-rw-r--r--dependencies.yaml6
-rw-r--r--examples/webchannel/chatclient-qml/chatclient-qml.qmlproject39
-rw-r--r--src/webchannel/qmetaobjectpublisher_p.h1
-rw-r--r--tests/auto/qml/testobject.h1
-rw-r--r--tests/auto/webchannel/tst_webchannel.h1
7 files changed, 47 insertions, 5 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 77b7fa8..a351044 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.1")
+set(QT_REPO_MODULE_VERSION "6.2.2")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index 8e2e94a..8b14b2d 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,4 +1,4 @@
load(qt_build_config)
CONFIG += warning_clean
-MODULE_VERSION = 6.2.1
+MODULE_VERSION = 6.2.2
diff --git a/dependencies.yaml b/dependencies.yaml
index 5e15d79..44621c0 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,10 @@
dependencies:
../qtbase:
- ref: d4a9b51f6e64266ad30a17d780db35f24e768ab9
+ ref: 040ee80219083b0662ba34c7bf5a420cd8b645db
required: true
../qtdeclarative:
- ref: 1020b5469388750b5fc75f5cd79f9a1d225b54e4
+ ref: a1e193cba1fe72b6835d787369e24c059c409fd1
required: false
../qtwebsockets:
- ref: 240896b58131f43eb31bd51626e5b8b7d6c97c05
+ ref: b55a955f29973ba32d3116f7cb89c15a10967efc
required: false
diff --git a/examples/webchannel/chatclient-qml/chatclient-qml.qmlproject b/examples/webchannel/chatclient-qml/chatclient-qml.qmlproject
new file mode 100644
index 0000000..3be8d04
--- /dev/null
+++ b/examples/webchannel/chatclient-qml/chatclient-qml.qmlproject
@@ -0,0 +1,39 @@
+import QmlProject
+
+Project {
+ mainFile: "MainForm.ui.qml"
+
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+
+ JavaScriptFiles {
+ directory: "."
+ }
+
+ ImageFiles {
+ directory: "."
+ }
+
+ Files {
+ filter: "qmldir"
+ directory: "."
+ }
+
+ Files {
+ filter: "*.ttf;*.otf"
+ }
+
+ Environment {
+ QT_AUTO_SCREEN_SCALE_FACTOR: "1"
+ }
+
+ qt6Project: true
+
+ /* List of plugin directories passed to QML runtime */
+ importPaths: [ ".", "imports" ]
+
+ /* Required for deployment */
+ targetDirectory: "/opt/chatclient"
+}
diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h
index a84eb52..2d25511 100644
--- a/src/webchannel/qmetaobjectpublisher_p.h
+++ b/src/webchannel/qmetaobjectpublisher_p.h
@@ -58,6 +58,7 @@
#include <QMetaObject>
#include <QBasicTimer>
#include <QPointer>
+#include <QProperty>
#include <QJsonObject>
#include <QQueue>
diff --git a/tests/auto/qml/testobject.h b/tests/auto/qml/testobject.h
index 07eaec8..f6dea1b 100644
--- a/tests/auto/qml/testobject.h
+++ b/tests/auto/qml/testobject.h
@@ -31,6 +31,7 @@
#define TESTOBJECT_H
#include <QObject>
+#include <QProperty>
#include <QVariantMap>
QT_BEGIN_NAMESPACE
diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h
index 071498f..9dfe82f 100644
--- a/tests/auto/webchannel/tst_webchannel.h
+++ b/tests/auto/webchannel/tst_webchannel.h
@@ -31,6 +31,7 @@
#define TST_WEBCHANNEL_H
#include <QObject>
+#include <QProperty>
#include <QVariant>
#include <QList>
#include <QJsonValue>