From 70aeeda60819bb8d0752e264dcc6472deb2a716a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 6 Aug 2012 16:44:52 +0200 Subject: move IMPORT_VERSION fallback into the conditional of the consumer Change-Id: I01336903aaaff8bca5407aa3c50d330e8fd7910a Reviewed-by: Joerg Bornemann --- mkspecs/features/qml_plugin.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index 70a7eb5567..e0bbc64893 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -9,7 +9,6 @@ isEmpty(CXX_MODULE) { } isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name) DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH -isEmpty(IMPORT_VERSION): IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION) QMLDIRFILE = $$_PRO_FILE_PWD_/qmldir fq_qml_files = $$QMLDIRFILE @@ -58,6 +57,8 @@ load(qt_targets) # directory. Then review and commit the changes made to plugins.qmltypes. # !cross_compile { + isEmpty(IMPORT_VERSION): IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION) + load(resolve_target) qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) qmltypes.target = qmltypes -- cgit v1.2.3