From bcc717b9ff5e9832794171217436029479b50f81 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 6 Aug 2019 16:22:35 +0200 Subject: Fix Qt6 build Modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: Ie46e7d5b6d4cd5e0e8c6eea5b3ebbbdd83343656 Reviewed-by: Simon Hausmann --- src/imports/sensors/sensors.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index fa4cb3c..2e2a2bf 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -223,8 +223,9 @@ public: qmlRegisterType (package, major, minor, "LidSensor"); qmlRegisterUncreatableType(package, major, minor, "LidReading", QLatin1String("Cannot create LidReading")); - // 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); } }; -- cgit v1.2.1