From 8e134b63bc07b8b44a323757751a7b33badf6c4f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 6 Aug 2012 17:07:18 +0200 Subject: use global imports install location as the "build" dir for qml plugin files when doing a non-prefix build (which is the only case where the code is executed), the build location is always the same anyway, so there is no use in complicating things. Change-Id: Id98755d818e05a11bed505abcb8b9d52a7d5b7c4 Reviewed-by: Joerg Bornemann --- mkspecs/features/qml_plugin.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/features/qml_plugin.prf') diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index 83af91106d..94f96f69f1 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -22,10 +22,10 @@ for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_) OTHER_FILES += $$fq_qml_files exists($$[QT_HOST_PREFIX]/.qmake.cache) { - # These bizarre rules copy the files to the build directory + # These bizarre rules copy the files to the qtbase build directory qmlfiles2build.input = fq_qml_files - qmlfiles2build.output = $$DESTDIR/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + 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} -- cgit v1.2.3