summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-01-15 16:18:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-31 13:01:31 +0100
commit00a91c1bab7a121af67f279c06710259fedebeb6 (patch)
treeac33ac9770ddf32c9e5f05c58724a6a82ea54203
parent1f05334932a060599a9fef914dea39bc5ac91cea (diff)
downloadqtwebchannel-00a91c1bab7a121af67f279c06710259fedebeb6.tar.gz
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>
-rw-r--r--examples/qml/README2
-rw-r--r--sync.profile4
-rw-r--r--tests/tests.pro2
3 files changed, 6 insertions, 2 deletions
diff --git a/examples/qml/README b/examples/qml/README
index 425a88c..cf0e041 100644
--- a/examples/qml/README
+++ b/examples/qml/README
@@ -1,3 +1,3 @@
-To run this example, install QtWebChannel and QtQuickControls modules, then run:
+To run this example, install QtWebKit, QtWebChannel and QtQuickControls modules, then run:
qmlscene ./example.qml
diff --git a/sync.profile b/sync.profile
index c616ae8..36c410b 100644
--- a/sync.profile
+++ b/sync.profile
@@ -12,5 +12,9 @@
#
%dependencies = (
"qtbase" => "",
+ # optional dependencies:
"qtdeclarative" => "",
+ # TODO: disabled for now as it breaks CI builds on OSX
+ # requires changes to qtqa scripts as discussed with sifalt, sahumada, tronical
+ # "qtwebkit" => "",
);
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
}