diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-15 04:07:02 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-02-15 04:07:02 (GMT) |
| commit | e55cb23edff635061ec9537c7589b900cc65a83c (patch) | |
| tree | 2e95c5d69728948b5dacf407b120e398a5eb1d46 | |
| parent | 40a8d38c68258623da468483b75c5256240d0557 (diff) | |
| download | Qt-e55cb23edff635061ec9537c7589b900cc65a83c.zip Qt-e55cb23edff635061ec9537c7589b900cc65a83c.tar.gz Qt-e55cb23edff635061ec9537c7589b900cc65a83c.tar.bz2 | |
Make tests compile without webkit
| -rw-r--r-- | tests/auto/declarative/declarative.pro | 5 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlengine/qmlengine.pro | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 8773026..c0e807e 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -35,7 +35,6 @@ SUBDIRS += \ qmlgraphicstext \ # Cover qmlgraphicstextedit \ # Cover qmlgraphicstextinput \ # Cover - qmlgraphicswebview \ # Cover qmlinfo \ # Cover qmlinstruction \ # Cover qmllanguage \ # Cover @@ -59,6 +58,10 @@ SUBDIRS += \ qmlxmlhttprequest \ # Cover sql # Cover +contains(QT_CONFIG, webkit) { + SUBDIRS += \ + qmlgraphicswebview # Cover +} # Tests which should run in Pulse PULSE_TESTS = $$SUBDIRS diff --git a/tests/auto/declarative/qmlengine/qmlengine.pro b/tests/auto/declarative/qmlengine/qmlengine.pro index 21d55a4..1a0e5f4 100644 --- a/tests/auto/declarative/qmlengine/qmlengine.pro +++ b/tests/auto/declarative/qmlengine/qmlengine.pro @@ -1,5 +1,5 @@ load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative webkit network +contains(QT_CONFIG,declarative): QT += declarative network macx:CONFIG -= app_bundle SOURCES += tst_qmlengine.cpp |