diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-06 16:44:52 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 23:27:17 +0200 |
| commit | 70aeeda60819bb8d0752e264dcc6472deb2a716a (patch) | |
| tree | d0971a24cd135dab766f267a4b2b9f8d3eebea58 /mkspecs | |
| parent | 3d8fbaa86655676aed09376cbee0ad15a128575c (diff) | |
move IMPORT_VERSION fallback into the conditional of the consumer
Change-Id: I01336903aaaff8bca5407aa3c50d330e8fd7910a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qml_plugin.prf | 3 |
1 files changed, 2 insertions, 1 deletions
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 |