aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/workerscript
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-07-24 16:19:48 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-07-24 16:26:35 +0200
commit09cc372a3a14906aa2130f44c4950dcdd8c9bf0d (patch)
tree20064c825a30c63d46c45203880eef364ca20a00 /src/imports/workerscript
parent78254be6cbd239a3de332c5660b2c408d9f3e674 (diff)
parent487d22bcde7e9d06162d44e7c5dca31d3afac694 (diff)
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Diffstat (limited to 'src/imports/workerscript')
-rw-r--r--src/imports/workerscript/plugin.cpp3
-rw-r--r--src/imports/workerscript/qmldir3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/workerscript/plugin.cpp b/src/imports/workerscript/plugin.cpp
index 5b3bff7934..2d8797db7e 100644
--- a/src/imports/workerscript/plugin.cpp
+++ b/src/imports/workerscript/plugin.cpp
@@ -71,8 +71,7 @@ public:
QQmlWorkerScriptModule::defineModule();
- // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ qmlRegisterModule(uri, 2, 15);
}
};
diff --git a/src/imports/workerscript/qmldir b/src/imports/workerscript/qmldir
index 0e811d1dbc..02ff9ea188 100644
--- a/src/imports/workerscript/qmldir
+++ b/src/imports/workerscript/qmldir
@@ -1,3 +1,4 @@
module QtQml.WorkerScript
-plugin workerscriptsplugin
+plugin workerscriptplugin
classname QtQmlWorkerScriptPlugin
+designersupported