add qml1_{module,plugin}.prf

these are in fact thin wrappers around the qml2 variants, which got
respective hooks.

Change-Id: I1190856aea3f454b6f163e147d39c707a35ec4c6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2012-10-26 15:26:34 +02:00 committed by The Qt Project
parent dca34854ef
commit 21d74702d1
4 changed files with 23 additions and 4 deletions

View File

@ -0,0 +1,2 @@
CONFIG += qml1_target
load(qml_module)

View File

@ -0,0 +1,2 @@
CONFIG += qml1_target
load(qml_plugin)

View File

@ -9,6 +9,11 @@ for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_)
# Only for Qt Creator's project view # Only for Qt Creator's project view
OTHER_FILES += $$fq_qml_files OTHER_FILES += $$fq_qml_files
qml1_target: \
instbase = $$[QT_INSTALL_IMPORTS]/QtDeclarative
else: \
instbase = $$[QT_INSTALL_IMPORTS]
exists($$[QT_HOST_PREFIX]/.qmake.cache) { exists($$[QT_HOST_PREFIX]/.qmake.cache) {
# These bizarre rules copy the files to the qtbase build directory # These bizarre rules copy the files to the qtbase build directory
@ -17,7 +22,7 @@ exists($$[QT_HOST_PREFIX]/.qmake.cache) {
} }
qmlfiles2build.input = fq_qml_files qmlfiles2build.input = fq_qml_files
qmlfiles2build.output = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH/${QMAKE_FUNC_FILE_IN_qmlModStripSrcDir} qmlfiles2build.output = $$instbase/$$TARGETPATH/${QMAKE_FUNC_FILE_IN_qmlModStripSrcDir}
!contains(TEMPLATE, vc.*): qmlfiles2build.variable_out = PRE_TARGETDEPS !contains(TEMPLATE, vc.*): qmlfiles2build.variable_out = PRE_TARGETDEPS
qmlfiles2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} qmlfiles2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
qmlfiles2build.name = COPY ${QMAKE_FILE_IN} qmlfiles2build.name = COPY ${QMAKE_FILE_IN}
@ -29,5 +34,5 @@ exists($$[QT_HOST_PREFIX]/.qmake.cache) {
# Install rules # Install rules
qmldir.base = $$_PRO_FILE_PWD_ qmldir.base = $$_PRO_FILE_PWD_
qmldir.files = $$fq_qml_files qmldir.files = $$fq_qml_files
qmldir.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.path = $$instbase/$$TARGETPATH
INSTALLS += qmldir INSTALLS += qmldir

View File

@ -24,7 +24,12 @@ exists($$QMLTYPEFILE): QML_FILES += $$QMLTYPEFILE
# Install rules # Install rules
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qml1_target: \
instbase = $$[QT_INSTALL_IMPORTS]/QtDeclarative
else: \
instbase = $$[QT_INSTALL_IMPORTS]
target.path = $$instbase/$$TARGETPATH
INSTALLS += target INSTALLS += target
# Some final setup # Some final setup
@ -46,10 +51,15 @@ load(qt_targets)
isEmpty(IMPORT_VERSION): IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION) isEmpty(IMPORT_VERSION): IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION)
load(resolve_target) load(resolve_target)
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) qml1_target: \
qmlplugindump = qml1plugindump
else: \
qmlplugindump = qmlplugindump
qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump)
importpath.value = importpath.value =
for(qmod, QMAKEMODULES) { for(qmod, QMAKEMODULES) {
qmod = $$section(qmod, /, 0, -3)/imports qmod = $$section(qmod, /, 0, -3)/imports
qml1_target: qmod = $$qmod/QtDeclarative
exists($$qmod): importpath.value += $$shell_path($$qmod) exists($$qmod): importpath.value += $$shell_path($$qmod)
} }
importpath.name = QML_IMPORT_PATH importpath.name = QML_IMPORT_PATH