diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/sql/kernel | |
parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) | |
download | qtbase-95cebd34ebc5b4d39b11dc91610309a35e488663.tar.gz |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/sql/kernel')
-rw-r--r-- | tests/auto/sql/kernel/qsql/qsql.pro | 10 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro | 14 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqldriver/qsqldriver.pro | 10 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlerror/qsqlerror.pro | 10 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlfield/qsqlfield.pro | 11 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlquery/qsqlquery.pro | 10 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro | 16 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlthread/qsqlthread.pro | 10 |
8 files changed, 1 insertions, 90 deletions
diff --git a/tests/auto/sql/kernel/qsql/qsql.pro b/tests/auto/sql/kernel/qsql/qsql.pro index 3357e762dc..e05329662b 100644 --- a/tests/auto/sql/kernel/qsql/qsql.pro +++ b/tests/auto/sql/kernel/qsql/qsql.pro @@ -6,13 +6,3 @@ QT += sql sql-private gui widgets wince*: { DEPLOYMENT_PLUGIN += qsqlite } - -symbian { - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } -} diff --git a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro index effbf73449..6e7e4bcaef 100644 --- a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro +++ b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro @@ -16,17 +16,3 @@ wince*: { DEPLOYMENT += testData } - -symbian { - TARGET.EPOCHEAPSIZE=5000 5000000 - TARGET.EPOCSTACKSIZE=50000 - - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } -} - diff --git a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro index 25364555fe..3e31c81558 100644 --- a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro +++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro @@ -15,13 +15,3 @@ wince*: { LIBS += ws2_32.lib } } - -symbian { - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } -} diff --git a/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro index ebf6d24381..208064a4c3 100644 --- a/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro +++ b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro @@ -6,13 +6,3 @@ load(qttest_p4) QT = core sql SOURCES += tst_qsqlerror.cpp - -symbian { - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } -} diff --git a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro index 9a82d0cf2b..2b1b3649c9 100644 --- a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro +++ b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro @@ -2,14 +2,3 @@ load(qttest_p4) SOURCES += tst_qsqlfield.cpp QT = core sql - -symbian { - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } -} - diff --git a/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro index fbcc998900..9f862de9a4 100644 --- a/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro +++ b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro @@ -13,13 +13,3 @@ wince*: { DEPLOYMENT += plugFiles LIBS += -lws2 } - -symbian { - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } -} diff --git a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro index bc653585d7..71e2a536b4 100644 --- a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro +++ b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro @@ -1,20 +1,4 @@ load(qttest_p4) SOURCES += tst_qsqlrecord.cpp -symbian { - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } - - TARGET.EPOCSTACKSIZE=50000 - TARGET.EPOCHEAPSIZE=50000 5000000 -} - QT = core sql - - - diff --git a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro index 2e4c72ac92..ab3960c63b 100644 --- a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro +++ b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro @@ -9,15 +9,7 @@ wince*: { plugFiles.path = . DEPLOYMENT += plugFiles LIBS += -lws2 -}else:symbian { - qt_not_deployed { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.files = sqlite3.dll - DEPLOYMENT += sqlite - } - } -}else { +} else { win32:LIBS += -lws2_32 } |