diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-11 16:33:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 18:59:48 +0200 |
| commit | e3124c4963ac1879a2177c71a2a8bb9896057123 (patch) | |
| tree | 0012d5d371587faf38c76a0815ce01535381a3f9 /mkspecs/features | |
| parent | 09d3ebbf2a422e5e19528877e5e2fcdab6a889f7 (diff) | |
do not mess with VERSION
the import version is not supposed to determine the plugin version -
it's only used by the qmltypes target.
Change-Id: I0cb072cb0ee469bd96830262dbf4971a2bf3134f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qml_plugin.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index f88e5a3a0c..0c9cf71ef4 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -9,7 +9,7 @@ isEmpty(CXX_MODULE) { } isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name) DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH -isEmpty(VERSION): VERSION = $$eval(QT.$${CXX_MODULE}.VERSION_MAJOR).$$eval(QT.$${CXX_MODULE}.VERSION_MINOR) +isEmpty(IMPORT_VERSION): IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.VERSION_MAJOR).$$eval(QT.$${CXX_MODULE}.VERSION_MINOR) QMLDIRFILE = $$_PRO_FILE_PWD_/qmldir fq_qml_files = $$QMLDIRFILE @@ -31,7 +31,7 @@ for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_) load(resolve_target) qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) qmltypes.target = qmltypes - qmltypes.commands = $$QMLPLUGINDUMP $$replace(TARGETPATH, /, .) $$VERSION $$QMAKE_RESOLVED_TARGET > $$QMLTYPEFILE + qmltypes.commands = $$QMLPLUGINDUMP $$replace(TARGETPATH, /, .) $$IMPORT_VERSION $$QMAKE_RESOLVED_TARGET > $$QMLTYPEFILE qmltypes.depends = $$QMAKE_RESOLVED_TARGET QMAKE_EXTRA_TARGETS += qmltypes } |