diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 7 | ||||
| -rw-r--r-- | src/imports/sensors/sensors.cpp | 5 |
3 files changed, 11 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/dependencies.yaml b/dependencies.yaml new file mode 100644 index 00000000..3da704be --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,7 @@ +dependencies: + ../qtbase: + ref: 089d54f06ff327f5212cb08fdbcb540066357dd5 + required: true + ../qtdeclarative: + ref: 406f15ce0e2707452462ff73b2d660ece960623f + required: false 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); } }; |