From 89af8871c653197d91541858013d08b8e7cbf751 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 6 Aug 2019 16:25:23 +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: I74710466b3ed459ee3b4c99ab1fbf5c9eb320d5d Reviewed-by: Simon Hausmann --- src/imports/audioengine/audioengine.cpp | 4 +++- src/imports/multimedia/multimedia.cpp | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp index 537b09ab8..698f41bdc 100644 --- a/src/imports/audioengine/audioengine.cpp +++ b/src/imports/audioengine/audioengine.cpp @@ -80,7 +80,9 @@ public: qmlRegisterType(uri, 1, 1, "AudioEngine"); qmlRegisterType(uri, 1, 1, "Sound"); - qmlRegisterModule(uri, 1, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 1, 15); } }; diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 8aed83d33..5e3071f2b 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -160,8 +160,9 @@ public: // 5.13 types qmlRegisterType(uri, 5, 13, "VideoOutput"); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule(uri, 5, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 5, 15); } void initializeEngine(QQmlEngine *engine, const char *uri) override -- cgit v1.2.3