qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kai Koehne 2018-08-30 10:51:26 +02:00
parent 86c4df64f1
commit 8725f9873d
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/folderlistmodel/folderlistmodel.pro
View File

@ -1,7 +1,7 @@
CXX_MODULE = qml CXX_MODULE = qml
TARGET = qmlfolderlistmodelplugin TARGET = qmlfolderlistmodelplugin
TARGETPATH = Qt/labs/folderlistmodel TARGETPATH = Qt/labs/folderlistmodel
IMPORT_VERSION = 2.1 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
QT = core-private qml-private QT = core-private qml-private

2
src/imports/localstorage/localstorage.pro
View File

@ -1,7 +1,7 @@
CXX_MODULE = qml CXX_MODULE = qml
TARGET = qmllocalstorageplugin TARGET = qmllocalstorageplugin
TARGETPATH = QtQuick/LocalStorage TARGETPATH = QtQuick/LocalStorage
IMPORT_VERSION = 2.$${QT_MINOR_VERSION} IMPORT_VERSION = 2.$$QT_MINOR_VERSION
QT = sql qml-private core-private QT = sql qml-private core-private

4
src/imports/qtqml/qtqml.pro
View File

@ -7,8 +7,6 @@ load(qml_module)
!cross_compile:if(build_pass|!debug_and_release) { !cross_compile:if(build_pass|!debug_and_release) {
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
# Use QtQml version defined in qmlplugindump source qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable QtQml 2.$$QT_MINOR_VERSION > $$PWD/plugins.qmltypes
# TODO: retrieve the correct version from QtQml
qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable QtQml 2.2 > $$PWD/plugins.qmltypes
QMAKE_EXTRA_TARGETS += qmltypes QMAKE_EXTRA_TARGETS += qmltypes
} }

2
src/imports/qtquick2/qtquick2.pro
View File

@ -1,7 +1,7 @@
CXX_MODULE = qml CXX_MODULE = qml
TARGET = qtquick2plugin TARGET = qtquick2plugin
TARGETPATH = QtQuick.2 TARGETPATH = QtQuick.2
IMPORT_VERSION = 2.12 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
SOURCES += \ SOURCES += \
plugin.cpp plugin.cpp

2
src/imports/shapes/shapes.pro
View File

@ -1,7 +1,7 @@
CXX_MODULE = qml CXX_MODULE = qml
TARGET = qmlshapesplugin TARGET = qmlshapesplugin
TARGETPATH = QtQuick/Shapes TARGETPATH = QtQuick/Shapes
IMPORT_VERSION = 1.11 IMPORT_VERSION = 1.$$QT_MINOR_VERSION
QT = core gui-private qml quick-private quickshapes-private QT = core gui-private qml quick-private quickshapes-private

4
tools/qmlplugindump/main.cpp
View File

@ -79,9 +79,9 @@
namespace { namespace {
const uint qtQmlMajorVersion = 2; const uint qtQmlMajorVersion = 2;
const uint qtQmlMinorVersion = 2; const uint qtQmlMinorVersion = QT_VERSION_MINOR;
const uint qtQuickMajorVersion = 2; const uint qtQuickMajorVersion = 2;
const uint qtQuickMinorVersion = 8; const uint qtQuickMinorVersion = QT_VERSION_MINOR;
const QString qtQuickQualifiedName = QString::fromLatin1("QtQuick %1.%2") const QString qtQuickQualifiedName = QString::fromLatin1("QtQuick %1.%2")
.arg(qtQuickMajorVersion) .arg(qtQuickMajorVersion)