diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-06 16:43:43 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 23:27:17 +0200 |
| commit | 3d8fbaa86655676aed09376cbee0ad15a128575c (patch) | |
| tree | a243199753f6fbf755ebfa08fc503cfccebcacb3 /mkspecs | |
| parent | 495017e5d40e5c3310e35b8897644c7d39e32ad4 (diff) | |
move qmltypes "compiler" below TARGET manipulation
load(resolve_target) must not be called before we have a final target
name.
Change-Id: Ia7418672b0c7b7fbd388a63819af9ea9a54c5241
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qml_plugin.prf | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index dcdec2a7b8..70a7eb5567 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -19,23 +19,6 @@ exists($$QMLTYPEFILE): fq_qml_files += $$QMLTYPEFILE for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_) -# plugins.qmltypes is used by Qt Creator for syntax highlighting and the QML code model. It needs -# to be regenerated whenever the QML elements exported by the plugin change. This cannot be done -# automatically at compile time because qmlplugindump does not support some QML features and it may -# not be possible when cross-compiling. -# -# To regenerate run 'make qmltypes' which will update the plugins.qmltypes file in the source -# directory. Then review and commit the changes made to plugins.qmltypes. -# -!cross_compile { - load(resolve_target) - qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) - qmltypes.target = qmltypes - qmltypes.commands = $$QMLPLUGINDUMP $$replace(TARGETPATH, /, .) $$IMPORT_VERSION $$QMAKE_RESOLVED_TARGET > $$QMLTYPEFILE - qmltypes.depends = $$QMAKE_RESOLVED_TARGET - QMAKE_EXTRA_TARGETS += qmltypes -} - # Only for Qt Creator's project view OTHER_FILES += $$fq_qml_files @@ -65,3 +48,20 @@ TARGET = $$qtLibraryTarget($$TARGET) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols load(qt_targets) + +# plugins.qmltypes is used by Qt Creator for syntax highlighting and the QML code model. It needs +# to be regenerated whenever the QML elements exported by the plugin change. This cannot be done +# automatically at compile time because qmlplugindump does not support some QML features and it may +# not be possible when cross-compiling. +# +# To regenerate run 'make qmltypes' which will update the plugins.qmltypes file in the source +# directory. Then review and commit the changes made to plugins.qmltypes. +# +!cross_compile { + load(resolve_target) + qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) + qmltypes.target = qmltypes + qmltypes.commands = $$QMLPLUGINDUMP $$replace(TARGETPATH, /, .) $$IMPORT_VERSION $$QMAKE_RESOLVED_TARGET > $$QMLTYPEFILE + qmltypes.depends = $$QMAKE_RESOLVED_TARGET + QMAKE_EXTRA_TARGETS += qmltypes +} |