summaryrefslogtreecommitdiffstats
path: root/basicsuite/enterprise-gallery
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@theqtcompany.com>2014-12-01 11:02:18 +0100
committerAndy Nichols <andy.nichols@theqtcompany.com>2014-12-02 11:34:39 +0200
commit92ee9380d360ca1c01c351ed6d5106e1799b0889 (patch)
tree19b1d3acebc0596ed8582694c2ab29a41e690202 /basicsuite/enterprise-gallery
parent69f43cbede072614bba882c3f5df0d9ecbf1c2f8 (diff)
Support Flat style and add new Controls demo
The Flat style for Qt Quick Controls is now enabled by defualt for the launcher and there are a few places that needed to be tweeked for use the correct style. In addition there is a new controls demo that shows off both the Enterprise Controls from before along side the existing controls, but both using the new Flat style which is only available to customers and is intended for touch devices. So we add one new demo, and disable 2 others (via exclude.txt) Change-Id: I8aa6ddd7d48375fdf64150b0c5e2d451da07d00d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'basicsuite/enterprise-gallery')
-rw-r--r--basicsuite/enterprise-gallery/exclude.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/basicsuite/enterprise-gallery/exclude.txt b/basicsuite/enterprise-gallery/exclude.txt
new file mode 100644
index 0000000..0702cb5
--- /dev/null
+++ b/basicsuite/enterprise-gallery/exclude.txt
@@ -0,0 +1 @@
+all