aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-09 21:52:12 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-09 21:54:50 +0100
commitef5e426bed3b1362394c7cc0c97522bb20cacff0 (patch)
tree0450da77b661d2e97eb7628b4c667ee22c6dc443 /examples
parent2cdec3eadc7ac1d1e5c4cd505b60196e44df1a7d (diff)
parent10b8f6af42a1cd80273d0a2d36e75b79078b5994 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: .qmake.conf src/quicktemplates2/qquickabstractbutton_p.h Change-Id: I265cbd2ce51beaf2afef99292c2e2798dadb4ba3
Diffstat (limited to 'examples')
-rw-r--r--examples/quickcontrols2/quickcontrols2.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/quickcontrols2/quickcontrols2.pro b/examples/quickcontrols2/quickcontrols2.pro
index 3e2e3948..6d0a3875 100644
--- a/examples/quickcontrols2/quickcontrols2.pro
+++ b/examples/quickcontrols2/quickcontrols2.pro
@@ -6,7 +6,9 @@ SUBDIRS += \
contactlist \
sidepanel \
swipetoremove \
- flatstyle \
wearable \
imagine/automotive \
imagine/musicplayer
+ wearable
+
+qtHaveModule(widgets): SUBDIRS += flatstyle