summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-08-06 16:18:01 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-08-07 00:54:57 +0200
commitd87b0adb32e7ed1d897670b59d7ebbb7c504c75c (patch)
treeb1931c62520a25934581c05c74e6aadc274676a2
parent43ef51f08bdbd92c8e863fca3b3b8d8955603764 (diff)
downloadqtwebchannel-wip/qt6.tar.gz
Fix Qt6 buildwip/qt6
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: I1a59d179d4b547bd8050f31a3edfef660db442be Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/imports/webchannel/plugin.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/webchannel/plugin.cpp b/src/imports/webchannel/plugin.cpp
index b6d4018..45d83b1 100644
--- a/src/imports/webchannel/plugin.cpp
+++ b/src/imports/webchannel/plugin.cpp
@@ -61,8 +61,9 @@ void QWebChannelPlugin::registerTypes(const char *uri)
int minor = 0;
qmlRegisterType<QQmlWebChannel>(uri, major, minor, "WebChannel");
- // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
- qmlRegisterModule(uri, 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(uri, major, 15);
}
QT_END_NAMESPACE