diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 01:00:11 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 01:00:11 +0200 |
| commit | 264e66afb2739b502464e6ed972207bd3ea89d22 (patch) | |
| tree | 8ea62cb4d48c900f5971c0645e70308fb6660f75 /mkspecs | |
| parent | 1e5deb06416b6efc33a2009d9678fd8f743c5ce7 (diff) | |
| parent | d441f6bba7b2aaf1e11b95c1ad4c785e6939f6ba (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I1bdc28a3ae825ea35e83f20fe16d2409515e5a3d
Diffstat (limited to 'mkspecs')
| -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 } } |