summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-09 10:28:48 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-09 10:28:48 +0200
commit5517c63c2eb601f3a9a2cb1e43d21b5e662b18cc (patch)
tree9b8e50a5312dc17d388f3425ffb9ea9fb0db6bef /examples
parentc3cbbf362c769b065fd0586b0510d043cbae92a4 (diff)
parent45f79dc7e572c1a1e4c40633d5055d0c6741cfbe (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: src/qml/qml/qqmlcomponent.cpp tests/auto/quick/scenegraph/tst_scenegraph.cpp Change-Id: Ibc811b95a57f175ca53337db7bbd1f575a745937
Diffstat (limited to 'examples')
-rw-r--r--examples/quick/demos/demos.pro3
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
index e6937683ab..0644b81a22 100644
--- a/examples/quick/demos/demos.pro
+++ b/examples/quick/demos/demos.pro
@@ -5,8 +5,7 @@ SUBDIRS = samegame \
tweetsearch \
maroon \
photosurface \
- photoviewer \
stocqt
-qtHaveModule(xmlpatterns): SUBDIRS += rssnews
+qtHaveModule(xmlpatterns): SUBDIRS += rssnews photoviewer