diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/folderlistmodel/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/layouts/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/localstorage/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/models/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/particles/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/qtqml/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/qtquick2/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/shapes/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/statemachine/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/testlib/main.cpp | 3 | ||||
-rw-r--r-- | src/imports/wavefrontmesh/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/window/plugin.cpp | 3 | ||||
-rw-r--r-- | src/imports/workerscript/plugin.cpp | 3 | ||||
-rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 3 |
14 files changed, 14 insertions, 28 deletions
diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp index 31cd793737..40968d5e1d 100644 --- a/src/imports/folderlistmodel/plugin.cpp +++ b/src/imports/folderlistmodel/plugin.cpp @@ -60,8 +60,7 @@ public: qmlRegisterType<QQuickFolderListModel,1>(uri,2,1,"FolderListModel"); qmlRegisterType<QQuickFolderListModel,2>(uri,2,2,"FolderListModel"); - // 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); // revision in Qt 5.11: added status property qmlRegisterType<QQuickFolderListModel,11>(uri, 2, 11, "FolderListModel"); diff --git a/src/imports/layouts/plugin.cpp b/src/imports/layouts/plugin.cpp index d28109c3cf..03a2c8fd00 100644 --- a/src/imports/layouts/plugin.cpp +++ b/src/imports/layouts/plugin.cpp @@ -67,8 +67,7 @@ public: QStringLiteral("Do not create objects of type Layout")); qmlRegisterRevision<QQuickGridLayoutBase, 1>(uri, 1, 1); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule(uri, 1, QT_VERSION_MINOR); + qmlRegisterModule(uri, 1, 15); } }; //![class decl] diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 9004d1ee6f..740a394fa0 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -825,8 +825,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.LocalStorage")); qmlRegisterSingletonType<QQuickLocalStorage>(uri, 2, 0, "LocalStorage", module_api_factory); - // 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/models/plugin.cpp b/src/imports/models/plugin.cpp index 9fe63412f3..fd99f243b0 100644 --- a/src/imports/models/plugin.cpp +++ b/src/imports/models/plugin.cpp @@ -77,8 +77,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQml.Models")); QQmlModelsModule::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); } }; //![class decl] diff --git a/src/imports/particles/plugin.cpp b/src/imports/particles/plugin.cpp index 26fd979133..704eb0ffbe 100644 --- a/src/imports/particles/plugin.cpp +++ b/src/imports/particles/plugin.cpp @@ -56,8 +56,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Particles")); QQuickParticlesModule::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); } }; //![class decl] diff --git a/src/imports/qtqml/plugin.cpp b/src/imports/qtqml/plugin.cpp index 7595d6d65b..04cc2cc082 100644 --- a/src/imports/qtqml/plugin.cpp +++ b/src/imports/qtqml/plugin.cpp @@ -80,8 +80,7 @@ public: QQmlModelsModule::registerQmlTypes(); #endif - // Auto-increment the import to stay in sync with ALL future QtQml minor versions from 5.11 onward - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + qmlRegisterModule(uri, 2, 15); } }; //![class decl] diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index 6b44f782bd..6c9d08e379 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -73,8 +73,7 @@ public: #endif QQmlQtQuick2Module::defineModule(); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule("QtQuick", 2, QT_VERSION_MINOR); + qmlRegisterModule("QtQuick", 2, 15); } ~QtQuick2Plugin() override diff --git a/src/imports/shapes/plugin.cpp b/src/imports/shapes/plugin.cpp index 0679a70630..6197b2fdf5 100644 --- a/src/imports/shapes/plugin.cpp +++ b/src/imports/shapes/plugin.cpp @@ -64,8 +64,7 @@ public: qmlRegisterType<QQuickShapeRadialGradient>(uri, 1, 0, "RadialGradient"); qmlRegisterType<QQuickShapeConicalGradient>(uri, 1, 0, "ConicalGradient"); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions - qmlRegisterModule(uri, 1, QT_VERSION_MINOR); + qmlRegisterModule(uri, 1, 15); // revision in Qt 5.11: added containsMode property qmlRegisterType<QQuickShape, 11>(uri, 1, 11, "Shape"); diff --git a/src/imports/statemachine/plugin.cpp b/src/imports/statemachine/plugin.cpp index bf7499b31a..0ec2c353fc 100644 --- a/src/imports/statemachine/plugin.cpp +++ b/src/imports/statemachine/plugin.cpp @@ -69,8 +69,7 @@ public: qmlRegisterType<TimeoutTransition>(uri, 1, 0, "TimeoutTransition"); qmlProtectModule(uri, 1); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule(uri, 1, QT_VERSION_MINOR); + qmlRegisterModule(uri, 1, 15); } }; diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index fbaf3bc4e2..c5873c1058 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -152,8 +152,7 @@ public: qmlRegisterType<QuickTestUtil>(uri,1,0,"TestUtil"); qmlRegisterType<QQuickTouchEventSequence>(); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule(uri, 1, QT_VERSION_MINOR); + qmlRegisterModule(uri, 1, 15); } }; diff --git a/src/imports/wavefrontmesh/plugin.cpp b/src/imports/wavefrontmesh/plugin.cpp index 1a266b7e36..c695b5d19c 100644 --- a/src/imports/wavefrontmesh/plugin.cpp +++ b/src/imports/wavefrontmesh/plugin.cpp @@ -59,8 +59,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.wavefrontmesh")); qmlRegisterType<QWavefrontMesh>(uri, 1, 0, "WavefrontMesh"); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.12 onward - qmlRegisterModule(uri, 1, QT_VERSION_MINOR); + qmlRegisterModule(uri, 1, 15); } }; diff --git a/src/imports/window/plugin.cpp b/src/imports/window/plugin.cpp index dfe1dcf62e..a331708e87 100644 --- a/src/imports/window/plugin.cpp +++ b/src/imports/window/plugin.cpp @@ -71,8 +71,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Window")); QQuickWindowModule::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); } }; //![class decl] 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/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index 15a417a8b4..e6090e66ba 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -180,8 +180,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) QQmlPrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent }; QQmlPrivate::qmlregister(QQmlPrivate::AutoParentRegistration, &autoparent); - // Register the latest version, even if there are no new types or new revisions for existing types yet. - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + qmlRegisterModule(uri, 2, 15); #if !QT_CONFIG(quick_animatedimage) qmlRegisterTypeNotAvailable(uri,major,minor,"AnimatedImage", QCoreApplication::translate("QQuickAnimatedImage","Qt was built without support for QMovie")); |