diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-08-30 10:51:26 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-08-30 13:42:37 +0000 |
| commit | 8725f9873deda85eb426b989aa911f07fd80bf09 (patch) | |
| tree | b8908554c108e2bef1a78bc46a205452ac924c46 | |
| parent | 86c4df64f1fe55297afdb68e94df867e8f05ef32 (diff) | |
qmlplugindump: Automatically use most up to date QtQuick version
QtQuick / QML minor version is nowadays the same as the Qt minor
version.
Change-Id: I4d7ef0b101320ee2179746c95093b62e063adba2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 2 | ||||
| -rw-r--r-- | src/imports/localstorage/localstorage.pro | 2 | ||||
| -rw-r--r-- | src/imports/qtqml/qtqml.pro | 4 | ||||
| -rw-r--r-- | src/imports/qtquick2/qtquick2.pro | 2 | ||||
| -rw-r--r-- | src/imports/shapes/shapes.pro | 2 | ||||
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 4 |
6 files changed, 7 insertions, 9 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 99c54113e4..54ef107e45 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.1 +IMPORT_VERSION = 2.$$QT_MINOR_VERSION QT = core-private qml-private diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro index 2fc976d37d..5c8177e238 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.$$QT_MINOR_VERSION QT = sql qml-private core-private diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro index 8804c944e7..283ba8f131 100644 --- a/src/imports/qtqml/qtqml.pro +++ b/src/imports/qtqml/qtqml.pro @@ -7,8 +7,6 @@ load(qml_module) !cross_compile:if(build_pass|!debug_and_release) { qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) - # Use QtQml version defined in qmlplugindump source - # TODO: retrieve the correct version from QtQml - qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable QtQml 2.2 > $$PWD/plugins.qmltypes + qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable QtQml 2.$$QT_MINOR_VERSION > $$PWD/plugins.qmltypes QMAKE_EXTRA_TARGETS += qmltypes } diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro index b3c44b412b..744dce4195 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.12 +IMPORT_VERSION = 2.$$QT_MINOR_VERSION SOURCES += \ plugin.cpp diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro index 71bb456866..857fcd7564 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.11 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION QT = core gui-private qml quick-private quickshapes-private diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 5c5a6a8eb1..56bb633b9b 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -79,9 +79,9 @@ namespace { const uint qtQmlMajorVersion = 2; -const uint qtQmlMinorVersion = 2; +const uint qtQmlMinorVersion = QT_VERSION_MINOR; const uint qtQuickMajorVersion = 2; -const uint qtQuickMinorVersion = 8; +const uint qtQuickMinorVersion = QT_VERSION_MINOR; const QString qtQuickQualifiedName = QString::fromLatin1("QtQuick %1.%2") .arg(qtQuickMajorVersion) |