diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-10-25 14:42:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 08:42:23 +0200 |
commit | d04bf8f4073aa50b23ae154250932b5ddd3ddc0a (patch) | |
tree | 7a44d578fe0aa03facee96d75eaccbcedfc298fd /tests/auto/sql/kernel | |
parent | 6b29e881cdd93d8fccec50df9e8d001776800136 (diff) |
all remaining tests: eliminated usage of qttest_p4.prf
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: I02fe27b2c1800f929250fa8694ca2976c9661a12
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/sql/kernel')
-rw-r--r-- | tests/auto/sql/kernel/qsql/qsql.pro | 5 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro | 5 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqldriver/qsqldriver.pro | 5 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlerror/qsqlerror.pro | 5 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlfield/qsqlfield.pro | 5 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro | 5 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlthread/qsqlthread.pro | 5 |
7 files changed, 21 insertions, 14 deletions
diff --git a/tests/auto/sql/kernel/qsql/qsql.pro b/tests/auto/sql/kernel/qsql/qsql.pro index e05329662b..ac21bb392c 100644 --- a/tests/auto/sql/kernel/qsql/qsql.pro +++ b/tests/auto/sql/kernel/qsql/qsql.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsql SOURCES += tst_qsql.cpp -QT += sql sql-private gui widgets +QT += sql sql-private gui widgets testlib wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro index 6e7e4bcaef..89dc7a5c7c 100644 --- a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro +++ b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqldatabase SOURCES += tst_qsqldatabase.cpp -QT = core sql +QT = core sql testlib win32: { !wince*: LIBS += -lws2_32 diff --git a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro index 3e31c81558..9639d5cfae 100644 --- a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro +++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqldriver SOURCES += tst_qsqldriver.cpp -QT = core sql +QT = core sql testlib wince*: { plugFiles.files = ../../../plugins/sqldrivers diff --git a/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro index 208064a4c3..ef0d213dba 100644 --- a/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro +++ b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro @@ -2,7 +2,8 @@ # Project file for autotest for file qsqlerror.h ############################################################ -load(qttest_p4) -QT = core sql +CONFIG += testcase +TARGET = tst_qsqlerror +QT = core sql testlib SOURCES += tst_qsqlerror.cpp diff --git a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro index 2b1b3649c9..5e0f4afe4c 100644 --- a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro +++ b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqlfield SOURCES += tst_qsqlfield.cpp -QT = core sql +QT = core sql testlib diff --git a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro index 71e2a536b4..ee17b5f249 100644 --- a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro +++ b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqlrecord SOURCES += tst_qsqlrecord.cpp -QT = core sql +QT = core sql testlib diff --git a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro index ab3960c63b..73247545ce 100644 --- a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro +++ b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqlthread SOURCES += tst_qsqlthread.cpp -QT = core sql +QT = core sql testlib wince*: { |