From 00a91c1bab7a121af67f279c06710259fedebeb6 Mon Sep 17 00:00:00 2001
From: Milian Wolff <milian.wolff@kdab.com>
Date: Wed, 15 Jan 2014 16:18:58 +0100
Subject: Mark QtWebKit as optional module dependency.

The current CI system fails to build the webchannel when
QtWebKit is included in sync.profile, so we ignore it for now
and adapt the QMake build system to only include the declarative
tests when webkit is found.

As discussed with tronical, sifalt and sahumada, the qtqa scripts
will need to be adapted to cope with optional dependencies of non-qt5
modules.

Change-Id: Id89b763ef2697e9e72eb4064c150971b13ebccc3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 tests/tests.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/tests.pro b/tests/tests.pro
index 86a7a42..685188a 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -2,6 +2,6 @@ TEMPLATE = subdirs
 
 SUBDIRS += webchannel
 
-qtHaveModule(quick) {
+qtHaveModule(webkit):qtHaveModule(quick) {
     SUBDIRS += qml
 }
-- 
cgit v1.2.1