summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-07-31 13:51:58 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-21 13:10:10 +0200
commitb2e5d1acb1aca93157a6d4d0a026153134f9ad01 (patch)
tree8b095329722d5781e3499a12bdc1534a0863dfa0 /.gitignore
parentffbf8d724f39e9c8d05ae2049e8b79a61570e235 (diff)
downloadqtquickcontrols-b2e5d1acb1aca93157a6d4d0a026153134f9ad01.tar.gz
Add qml/js files in resource
All the qml and js files are embedded in the Qt Quick Controls plugin (for Controls, Styles and Private). If ApplicationWindow.qml is missing, loading the files from resource will be enabled. Otherwise, the files will be loaded from the local path. The purpose of this change is to make the deployment of Qt Quick Controls easier while keeping the development tasks convenient. With this solution: - It is only necessary to deploy the qmldir and the plugin qtquickcontrolsplugin found in the QtQuick/Controls folder. - By default the files used are the ones found in the local folder. Autocompletion and debugging capabilities remain unchanged. Task-number: QTBUG-31565 Change-Id: I938ebe261c3c35f9e3b066d82c81accd9750edc9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 289a534b..0dee120c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ Makefile*
moc_*.cpp
ui_*.h
qrc_*.cpp
+/src/controls/controls.qrc
# xemacs temporary files
*.flc