summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-11 23:28:32 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-11 23:28:32 +0200
commit182c8738482925dac65ba134751a4e81f6daf5a6 (patch)
treed29c8a5da722ddfaebfd7952ccc5f22642f0b910
parentbc024925d192bd9785f912fcbb8983cfba66c1d2 (diff)
parentfff4d0a8fd161edfbef7b933deed8ec46a348bc6 (diff)
downloadqtwebkit-examples-182c8738482925dac65ba134751a4e81f6daf5a6.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib0b25e1a510be39aa911b8b452a9b0067e630659
-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