diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-06 20:39:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 23:27:17 +0200 |
| commit | 842b1bd29ea8914a00620432d860433fe5374cad (patch) | |
| tree | 07c64058dd0998a0e16fddcf99d69ed2a4772ea3 /mkspecs/features/qml_plugin.prf | |
| parent | 8e134b63bc07b8b44a323757751a7b33badf6c4f (diff) | |
factor qml_module out of qml_plugin
this makes it comfortable to create qml-only modules
Change-Id: I17a5a3ee24210b93db05e50502c6ca91a4e7a9d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/features/qml_plugin.prf')
| -rw-r--r-- | mkspecs/features/qml_plugin.prf | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index 94f96f69f1..5bbead4b97 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -10,38 +10,13 @@ isEmpty(CXX_MODULE) { isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name) DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH -QMLDIRFILE = $$_PRO_FILE_PWD_/qmldir -fq_qml_files = $$QMLDIRFILE - QMLTYPEFILE = $$_PRO_FILE_PWD_/plugins.qmltypes -exists($$QMLTYPEFILE): fq_qml_files += $$QMLTYPEFILE - -for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_) - -# Only for Qt Creator's project view -OTHER_FILES += $$fq_qml_files - -exists($$[QT_HOST_PREFIX]/.qmake.cache) { - # These bizarre rules copy the files to the qtbase build directory - - qmlfiles2build.input = fq_qml_files - qmlfiles2build.output = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} - !contains(TEMPLATE, vc.*): qmlfiles2build.variable_out = PRE_TARGETDEPS - qmlfiles2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - qmlfiles2build.name = COPY ${QMAKE_FILE_IN} - qmlfiles2build.CONFIG = no_link no_clean - - QMAKE_EXTRA_COMPILERS += qmlfiles2build -} +exists($$QMLTYPEFILE): QML_FILES += $$QMLTYPEFILE # Install rules target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files = $$fq_qml_files -qmldir.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +INSTALLS += target # Some final setup @@ -68,3 +43,5 @@ load(qt_targets) qmltypes.depends = $$QMAKE_RESOLVED_TARGET QMAKE_EXTRA_TARGETS += qmltypes } + +load(qml_module) |