summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2013-10-07 11:35:17 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-16 10:39:38 +0200
commit2f83bdbe5d536464c39d5e914efb1531e562eee7 (patch)
tree55674d3d7bd9ba40715204a65e296d94122a5f80 /.gitignore
parent54b73b8ab53ee41d9c8a855aa9a3da425e0a3f8f (diff)
Dialogs: use resources for QML and images
All the qml and image files are embedded in the QtQuick.Dialogs plugin. If DefaultFileDialog.qml is missing from the installation directory, loading from resources will be enabled. Otherwise, the files will be loaded from the local path. This is analogous to change b2e5d1acb1aca93157a6d4d0a026153134f9ad01 in Qt Quick Controls: it reduces the number of files that need to be installed, but also preserves ease of debugging whenever the QML files are separately installed. Task-number: QTBUG-31565 Change-Id: Idbe6be5d818eb6a25367f2053ea52bc7ac1485bc Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index fa221a5ede..7c37e4daff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,6 +105,7 @@ tools/activeqt/testcon/testcon.tlb
translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
+src/imports/dialogs/dialogs.qrc
# Test generated files
QObject.log