diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-06 16:15:48 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-06 17:08:29 +0200 |
commit | f5bc2b6e6e4985ee113c595abdd1a4bd8b3472fa (patch) | |
tree | 9f06f725b94a5592f683a48451217c88c6dd43bb /src | |
parent | f02f5165fe637de349d9a2240c1fb4d8ec253470 (diff) |
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: I2a04b8d0eeb3ed90f6f4de9a666a3e70f35c0ffd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/winextras/plugin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp index 41b3fe8..eadf357 100644 --- a/src/imports/winextras/plugin.cpp +++ b/src/imports/winextras/plugin.cpp @@ -61,7 +61,9 @@ public: void registerTypes(const char *uri) Q_DECL_OVERRIDE { Q_ASSERT(uri == QLatin1String("QtWinExtras")); - 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); qmlRegisterUncreatableType<QQuickWin>(uri, 1, 0, "QtWin", "Cannot create an instance of the QtWin namespace."); qmlRegisterType<QQuickDwmFeatures>(uri, 1, 0, "DwmFeatures"); qmlRegisterType<QQuickTaskbarButton>(uri, 1, 0, "TaskbarButton"); |