diff options
| -rw-r--r-- | examples/qml/README | 2 | ||||
| -rw-r--r-- | sync.profile | 4 | ||||
| -rw-r--r-- | tests/tests.pro | 2 |
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 } |