From 0a0dfa0d5c7604a75c1da5d2cdd6b41e9d9d6323 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 14 Jan 2020 14:36:30 +0100 Subject: Fix maximum minor to 15 for imports QT_MINOR_VERSION resets to 0 in dev. Change-Id: I0b0210c3664c8c42b5dfabf13abac2beef2a0e34 Reviewed-by: Fabian Kosmale --- src/imports/folderlistmodel/folderlistmodel.pro | 2 +- src/imports/layouts/layouts.pro | 2 +- src/imports/localstorage/localstorage.pro | 2 +- src/imports/models/models.pro | 2 +- src/imports/particles/particles.pro | 2 +- src/imports/qtqml/qtqml.pro | 2 +- src/imports/qtquick2/qtquick2.pro | 2 +- src/imports/shapes/shapes.pro | 2 +- src/imports/statemachine/statemachine.pro | 2 +- src/imports/testlib/testlib.pro | 2 +- src/imports/wavefrontmesh/wavefrontmesh.pro | 2 +- src/imports/window/window.pro | 2 +- src/imports/workerscript/workerscript.pro | 2 +- src/particles/particles.pro | 2 +- src/qml/qml.pro | 2 +- src/qmlmodels/qmlmodels.pro | 2 +- src/qmlworkerscript/qmlworkerscript.pro | 2 +- src/quick/quick.pro | 2 +- src/quickshapes/quickshapes.pro | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index fd05653879..8eaf9de6b9 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qmlfolderlistmodelplugin TARGETPATH = Qt/labs/folderlistmodel -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 QT = core-private qml-private diff --git a/src/imports/layouts/layouts.pro b/src/imports/layouts/layouts.pro index ea7940e4ad..c52046094e 100644 --- a/src/imports/layouts/layouts.pro +++ b/src/imports/layouts/layouts.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qquicklayoutsplugin TARGETPATH = QtQuick/Layouts -IMPORT_VERSION = 1.$$QT_MINOR_VERSION +IMPORT_VERSION = 1.15 QT *= qml-private quick-private gui-private core-private diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro index a95fa04401..d189808f49 100644 --- a/src/imports/localstorage/localstorage.pro +++ b/src/imports/localstorage/localstorage.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qmllocalstorageplugin TARGETPATH = QtQuick/LocalStorage -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 QT = sql qml-private core-private diff --git a/src/imports/models/models.pro b/src/imports/models/models.pro index fd13b12401..0eb9958631 100644 --- a/src/imports/models/models.pro +++ b/src/imports/models/models.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = modelsplugin TARGETPATH = QtQml/Models.2 -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 SOURCES += \ plugin.cpp diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 41146c75b0..d13babf30c 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = particlesplugin TARGETPATH = QtQuick/Particles.2 -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 SOURCES += \ plugin.cpp diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro index 902f0b1247..0211844b14 100644 --- a/src/imports/qtqml/qtqml.pro +++ b/src/imports/qtqml/qtqml.pro @@ -1,7 +1,7 @@ TARGETPATH = QtQml CXX_MODULE = qml TARGET = qmlplugin -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 SOURCES += \ plugin.cpp diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro index 8543049ead..da1772d415 100644 --- a/src/imports/qtquick2/qtquick2.pro +++ b/src/imports/qtquick2/qtquick2.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qtquick2plugin TARGETPATH = QtQuick.2 -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 SOURCES += \ plugin.cpp diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro index 857fcd7564..bb02dbf08f 100644 --- a/src/imports/shapes/shapes.pro +++ b/src/imports/shapes/shapes.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qmlshapesplugin TARGETPATH = QtQuick/Shapes -IMPORT_VERSION = 1.$$QT_MINOR_VERSION +IMPORT_VERSION = 1.15 QT = core gui-private qml quick-private quickshapes-private diff --git a/src/imports/statemachine/statemachine.pro b/src/imports/statemachine/statemachine.pro index d4977d8eb8..b17ec6140d 100644 --- a/src/imports/statemachine/statemachine.pro +++ b/src/imports/statemachine/statemachine.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qtqmlstatemachine TARGETPATH = QtQml/StateMachine -IMPORT_VERSION = 1.$$QT_MINOR_VERSION +IMPORT_VERSION = 1.15 QT = core-private qml-private diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro index d5e315d7da..de6453eeab 100644 --- a/src/imports/testlib/testlib.pro +++ b/src/imports/testlib/testlib.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qmltestplugin TARGETPATH = QtTest -IMPORT_VERSION = 1.$$QT_MINOR_VERSION +IMPORT_VERSION = 1.15 QT += quick qmltest-private qml-private core-private testlib gui-private diff --git a/src/imports/wavefrontmesh/wavefrontmesh.pro b/src/imports/wavefrontmesh/wavefrontmesh.pro index 0b28410750..f6d93b867d 100644 --- a/src/imports/wavefrontmesh/wavefrontmesh.pro +++ b/src/imports/wavefrontmesh/wavefrontmesh.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qmlwavefrontmeshplugin TARGETPATH = Qt/labs/wavefrontmesh -IMPORT_VERSION = 1.$$QT_MINOR_VERSION +IMPORT_VERSION = 1.15 QT = core-private qml-private quick-private diff --git a/src/imports/window/window.pro b/src/imports/window/window.pro index 068169b36f..9c14107267 100644 --- a/src/imports/window/window.pro +++ b/src/imports/window/window.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = windowplugin TARGETPATH = QtQuick/Window.2 -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 SOURCES += \ plugin.cpp diff --git a/src/imports/workerscript/workerscript.pro b/src/imports/workerscript/workerscript.pro index d48e285bda..aa68d193b4 100644 --- a/src/imports/workerscript/workerscript.pro +++ b/src/imports/workerscript/workerscript.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = workerscriptplugin TARGETPATH = QtQml/WorkerScript.2 -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 SOURCES += \ plugin.cpp diff --git a/src/particles/particles.pro b/src/particles/particles.pro index aaaa83419a..f4efb140bd 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -19,7 +19,7 @@ include(particles.pri) QMLTYPES_FILENAME = plugins.qmltypes QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Particles.2 QML_IMPORT_NAME = QtQuick.Particles -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes load(qt_module) diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 6d4b962d39..985f7ca383 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -70,7 +70,7 @@ MODULE_PLUGIN_TYPES = \ QMLTYPES_FILENAME = plugins.qmltypes QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml QML_IMPORT_NAME = QtQml -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes load(qt_module) diff --git a/src/qmlmodels/qmlmodels.pro b/src/qmlmodels/qmlmodels.pro index 8e9ca43434..6abc5bf186 100644 --- a/src/qmlmodels/qmlmodels.pro +++ b/src/qmlmodels/qmlmodels.pro @@ -66,7 +66,7 @@ qtConfig(qml-delegate-model) { QMLTYPES_FILENAME = plugins.qmltypes QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/Models.2 QML_IMPORT_NAME = QtQml.Models -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes load(qt_module) diff --git a/src/qmlworkerscript/qmlworkerscript.pro b/src/qmlworkerscript/qmlworkerscript.pro index 6a996a0d80..b091937796 100644 --- a/src/qmlworkerscript/qmlworkerscript.pro +++ b/src/qmlworkerscript/qmlworkerscript.pro @@ -20,7 +20,7 @@ include(../3rdparty/masm/masm-defs.pri) QMLTYPES_FILENAME = plugins.qmltypes QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/WorkerScript.2 QML_IMPORT_NAME = QtQml.WorkerScript -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes load(qt_module) diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 392a235b31..42bb4b6ec8 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -54,5 +54,5 @@ load(qt_module) QMLTYPES_FILENAME = plugins.qmltypes QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick.2 QML_IMPORT_NAME = QtQuick -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +IMPORT_VERSION = 2.15 CONFIG += qmltypes install_qmltypes install_metatypes diff --git a/src/quickshapes/quickshapes.pro b/src/quickshapes/quickshapes.pro index 4dbd3e5e46..7c71aa4f4a 100644 --- a/src/quickshapes/quickshapes.pro +++ b/src/quickshapes/quickshapes.pro @@ -35,5 +35,5 @@ load(qt_module) QMLTYPES_FILENAME = plugins.qmltypes QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Shapes QML_IMPORT_NAME = QtQuick.Shapes -IMPORT_VERSION = 1.$$QT_MINOR_VERSION +IMPORT_VERSION = 1.15 CONFIG += qmltypes install_qmltypes install_metatypes -- cgit v1.2.3