diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-21 10:18:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-21 06:11:06 +0200 |
| commit | 4114b9dcff68cdebc36e3b4818d4463d62421ecf (patch) | |
| tree | 4c329843d9713390d6b28212adb9587ed63d5049 /tests | |
| parent | 91a16c3a6db8ac4cfe6779a0b2d95097377dd04f (diff) | |
Fixed compile of examples and tests.
6aad4122332c0291e2e3249b508c7583428177b9 in qtbase removed implicit
linking to libQtWidgets. Projects which implicitly used that module
were broken.
Either remove the dependency where it is not required, or explicitly
opt-in to libQtWidgets where it is required.
Change-Id: I6f4fb1d98bdf5bb65b4f02a1d245d334314b163d
Reviewed-on: http://codereview.qt-project.org/5268
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests')
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro index 7b0c1d5560..5a68e67e44 100644 --- a/tests/auto/declarative/qsgborderimage/qsgborderimage.pro +++ b/tests/auto/declarative/qsgborderimage/qsgborderimage.pro @@ -1,5 +1,4 @@ load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h @@ -15,6 +14,6 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private declarative-private +QT += core-private gui-private declarative-private network widgets qpa:CONFIG+=insignificant_test # QTBUG-21004 fails, unstably diff --git a/tests/auto/declarative/qsgpathview/qsgpathview.pro b/tests/auto/declarative/qsgpathview/qsgpathview.pro index 312443f591..a9b3838a0c 100644 --- a/tests/auto/declarative/qsgpathview/qsgpathview.pro +++ b/tests/auto/declarative/qsgpathview/qsgpathview.pro @@ -1,5 +1,4 @@ load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_qsgpathview.cpp @@ -15,4 +14,4 @@ symbian: { CONFIG += parallel_test #temporary CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private widgets diff --git a/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro b/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro index 7770f8ff0f..31047068d7 100644 --- a/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro +++ b/tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro @@ -1,5 +1,4 @@ load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle SOURCES += tst_qsgvisualdatamodel.cpp @@ -14,4 +13,4 @@ symbian: { CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private +QT += core-private gui-private v8-private declarative-private widgets |