diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-28 16:41:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:14:42 +0200 |
| commit | e4079eca49adce16e31dac2a18d49d7a55817891 (patch) | |
| tree | 1dfb960ec1115b1f552afe8a013058542389505e /mkspecs/features/qml_module.prf | |
| parent | f32a6cfb6b6236533508901f114ab57396da8ff3 (diff) | |
| parent | ec6dc5f78453048c4f0604655a34c6c20c79d819 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Take 5.
Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3
Diffstat (limited to 'mkspecs/features/qml_module.prf')
| -rw-r--r-- | mkspecs/features/qml_module.prf | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf index dbf5b74355..57cfec78b3 100644 --- a/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf @@ -50,10 +50,7 @@ builtin_resources { # Install rules qmldir.base = $$qmldir_path -# Tools need qmldir and plugins.qmltypes always installed on the file system - qmldir.files = $$qmldir_file -install_qml_files: qmldir.files += $$fq_qml_files qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH INSTALLS += qmldir @@ -65,12 +62,12 @@ INSTALLS += qmlfiles !debug_and_release|!build_all|CONFIG(release, debug|release) { !prefix_build { - COPIES += qmldir + COPIES += qmldir qmlfiles } else { # For non-installed static builds, tools need qmldir and plugins.qmltypes # files in the build dir - qmldir2build.files = $$qmldir_file $$fq_aux_qml_files - qmldir2build.path = $$DESTDIR - COPIES += qmldir2build + qml2build.files = $$qmldir_file $$fq_aux_qml_files + qml2build.path = $$DESTDIR + COPIES += qml2build } } |