do not mess with VERSION
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 11 Jul 2012 14:33:47 +0000 (16:33 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 11 Jul 2012 16:59:48 +0000 (18:59 +0200)
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>
mkspecs/features/qml_plugin.prf

index f88e5a3..0c9cf71 100644 (file)
@@ -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
 }