diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-29 16:09:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-29 17:55:20 +0200 |
| commit | b894a8def5d9107663e4968d2d395f5ef3059125 (patch) | |
| tree | f894c50c9e5cbdd7ec102291eb94979977ce5b37 /mkspecs/features/qml_module.prf | |
| parent | d2304a28ca657634253af26ad803c7f292e6f4cc (diff) | |
| parent | 002112e80516a29efbb6cef721d74c5fc39fc19d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/qml_module.prf
mkspecs/features/qt_common.prf
src/gui/text/qzip.cpp
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/windows/array.h
src/testlib/qtestcase.cpp
src/widgets/dialogs/qfilesystemmodel.h
Change-Id: Ie41c5868415b81f7693c80e045497035504bb210
Diffstat (limited to 'mkspecs/features/qml_module.prf')
| -rw-r--r-- | mkspecs/features/qml_module.prf | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index 2115b39c04..6b3ad81953 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf @@ -28,24 +28,6 @@ else: \ !qml1_target:static: CONFIG += builtin_resources -!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { - # These bizarre rules copy the files to the qtbase build directory - - defineReplace(qmlModStripSrcDir) { - return($$relative_path($$1, $$_PRO_FILE_PWD_)) - } - - !builtin_resources: qmlfiles2build.input = fq_qml_files - else: qmlfiles2build.input = qmldir_file - qmlfiles2build.output = $$instbase/$$TARGETPATH/${QMAKE_FUNC_FILE_IN_qmlModStripSrcDir} - !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 -} - builtin_resources { URITARGET = $$replace(URI, "\\.", "_") # Ensure the qml files are included in the resources @@ -61,3 +43,5 @@ qmldir.base = $$_PRO_FILE_PWD_ else: qmldir.files = $$qmldir_file qmldir.path = $$instbase/$$TARGETPATH INSTALLS += qmldir + +!prefix_build: COPIES += qmldir |