Commit 799e2bb8 authored by Shawn Rutledge's avatar Shawn Rutledge Committed by The Qt Project
Browse files

QtQuick.Dialogs: deploy qml files only for debug builds


QML_FILES are installed with the qml plugin they belong to.  This is
helpful for debugging, but redundant because the same QML is also
packaged as resources (after 8780af05b1bc63aa71c3a318972465ffdb830070).

Task-number: QTBUG-31565
Change-Id: I0b277b62b48e0a742f3ef2ff6ee2a81cc071295e
Reviewed-by: default avatarCaroline Chao <caroline.chao@digia.com>
parent 9c5ff1e6
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 old/5.2 wip/cmake wip/dbus wip/gc wip/itemviews wip/nacl wip/new-backend wip/pointerhandler wip/propertycache-refactor wip/qquickdeliveryagent wip/scenegraphng wip/tizen wip/webassembly v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1
No related merge requests found
Showing with 5 additions and 2 deletions
...@@ -37,7 +37,7 @@ HEADERS += \ ...@@ -37,7 +37,7 @@ HEADERS += \
qquickfontdialog_p.h \ qquickfontdialog_p.h \
qquickabstractdialog_p.h qquickabstractdialog_p.h
QML_FILES += \ DIALOGS_QML_FILES += \
DefaultMessageDialog.qml \ DefaultMessageDialog.qml \
WidgetMessageDialog.qml \ WidgetMessageDialog.qml \
DefaultFileDialog.qml \ DefaultFileDialog.qml \
...@@ -76,7 +76,7 @@ RESOURCE_CONTENT = \ ...@@ -76,7 +76,7 @@ RESOURCE_CONTENT = \
"<RCC>" \ "<RCC>" \
"<qresource prefix=\"/QtQuick/Dialogs\">" "<qresource prefix=\"/QtQuick/Dialogs\">"
for(resourcefile, QML_FILES) { for(resourcefile, DIALOGS_QML_FILES) {
resourcefileabsolutepath = $$absolute_path($$resourcefile) resourcefileabsolutepath = $$absolute_path($$resourcefile)
relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_) relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_)
relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD) relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD)
...@@ -91,4 +91,7 @@ write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.") ...@@ -91,4 +91,7 @@ write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.")
RESOURCES += $$GENERATED_RESOURCE_FILE RESOURCES += $$GENERATED_RESOURCE_FILE
# In case of a debug build, deploy the QML files too
CONFIG(debug, debug|release): QML_FILES += $$DIALOGS_QML_FILES
load(qml_plugin) load(qml_plugin)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment