summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-05 09:02:17 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-05 09:02:17 +0200
commit45f79dc7e572c1a1e4c40633d5055d0c6741cfbe (patch)
tree61147ab31b0be97647417649934461b07ffa6983 /examples
parent6839f03051d2950e4721cbb5ee88fa7b07109588 (diff)
parentffe113ab628adf6c22e96a22cf0bcda8e80c290d (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h Change-Id: I1e6a9424e7f87d9e4ac1ea387ec70e151106f1c7
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