diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-16 14:07:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-19 10:24:25 +0200 |
| commit | b8d656d8787aaa5fd15d9646882a77ca818b80bd (patch) | |
| tree | c638bd0714cfced7549818a86bc4d46dd085353f /tests/auto/sql | |
| parent | 39a6ff81bc1d606e078a06316414829221a02024 (diff) | |
Fix autotest gui/widgets dependencies
This is in preparation of removing testlib's
dependency on QtGui and QtWidgets.
Autotests that need QtWidgets api must
explicitly include it (since the types are no
longer provided by the QtGui master header).
Autotests that don't need QtGui or QtWidgets
api shouldn't link against those libraries.
Change-Id: I2808289068514fcac582808828ad4634e2631733
Reviewed-on: http://codereview.qt-project.org/5093
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/sql')
7 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro index ee78b79c36..effbf73449 100644 --- a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro +++ b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qsqldatabase.cpp -QT += sql +QT = core sql win32: { !wince*: LIBS += -lws2_32 diff --git a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro index c02d74a527..25364555fe 100644 --- a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro +++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qsqldriver.cpp -QT += sql +QT = core sql wince*: { plugFiles.files = ../../../plugins/sqldrivers diff --git a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro index 2359151f13..9a82d0cf2b 100644 --- a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro +++ b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qsqlfield.cpp -QT += sql +QT = core sql symbian { qt_not_deployed { diff --git a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro index 16e3ae4f80..bc653585d7 100644 --- a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro +++ b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro @@ -14,7 +14,7 @@ symbian { TARGET.EPOCHEAPSIZE=50000 5000000 } -QT += sql +QT = core sql diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp index fabba48d7c..25fc893c77 100644 --- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp +++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp @@ -42,6 +42,7 @@ #include <QtTest/QtTest> #include <QtGui> +#include <QtWidgets> #include <qsqldriver.h> #include <qsqldatabase.h> diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro index dad42d512c..7561a63020 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qsqlrelationaltablemodel.cpp -QT += sql +QT = core sql wince*: { plugFiles.files = ../../../plugins/sqldrivers diff --git a/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro index e49020f0a6..697690d3f0 100644 --- a/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro +++ b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qsqltablemodel.cpp -QT += sql +QT = core sql wince*: { plugFiles.files = ../../../plugins/sqldrivers |