summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-04 15:32:08 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-04 15:32:08 +0200
commitfff4d0a8fd161edfbef7b933deed8ec46a348bc6 (patch)
tree66546294bc0017ecdb1587697f2e572a8c60e7fb
parent1b233eff36dd185d32a1e72a2ba0ef825b1f6ef7 (diff)
parentbb4c9761d2746fa26c67ed07821fdb38bb0a3c9b (diff)
downloadqtwebkit-examples-fff4d0a8fd161edfbef7b933deed8ec46a348bc6.tar.gz
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Iaef8f563467bbcdffb41991e1a0e3cfa85297969
-rw-r--r--examples/examples.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 69cdb08..b05b780 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-SUBDIRS += webkitqml
+qtHaveModule(quick): SUBDIRS += webkitqml
qtHaveModule(webkitwidgets): SUBDIRS += webkitwidgets