diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 13:51:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 13:51:24 +0200 |
| commit | 6f3b8e42ae95291958e2628a33d43aea4eba2b53 (patch) | |
| tree | 05864b6799bfa5b200c9d0a30a557049bf0ee123 | |
| parent | 4d8d306e3e555da92296cb8ca1b62fcfad0f5268 (diff) | |
| parent | bcc717b9ff5e9832794171217436029479b50f81 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I6cf814d560665490574bd35d5ebfce911a46270f
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/sensors/sensors.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 37ebce42..898cedcf 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index ce80a45c..de872c48 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -234,8 +234,9 @@ public: qmlRegisterType <QmlHumiditySensor >(package, major, minor, "HumiditySensor"); qmlRegisterUncreatableType<QmlHumidityReading >(package, major, minor, "HumidityReading", QLatin1String("Cannot create HumidityReading")); - // Register the latest Qt version as QML type version - qmlRegisterModule(package, QT_VERSION_MAJOR, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(package, 5, 15); } }; |