diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /tests/auto/sql | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'tests/auto/sql')
| -rw-r--r-- | tests/auto/sql/kernel/qsql/qsql.pro | 2 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsql/tst_qsql.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/sql/kernel/qsql/qsql.pro b/tests/auto/sql/kernel/qsql/qsql.pro index 0735986438..20cee413b2 100644 --- a/tests/auto/sql/kernel/qsql/qsql.pro +++ b/tests/auto/sql/kernel/qsql/qsql.pro @@ -3,7 +3,7 @@ CONFIG += parallel_test TARGET = tst_qsql SOURCES += tst_qsql.cpp -QT += sql sql-private gui testlib core-private +QT = core-private sql-private testlib wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/tests/auto/sql/kernel/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp index 5747683e4e..24f418af26 100644 --- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp +++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include <qguiapplication.h> +#include <qcoreapplication.h> #include <qsqldatabase.h> #include <qsqlerror.h> #include <qsqlquery.h> @@ -115,7 +115,7 @@ void tst_QSql::basicDriverTest() { int argc = 1; char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; - QGuiApplication app(argc, argv, false); + QCoreApplication app(argc, argv, false); tst_Databases dbs; dbs.open(); @@ -150,7 +150,7 @@ void tst_QSql::basicDriverTest() } // make sure that the static stuff will be deleted -// when using multiple QGuiApplication objects +// when using multiple QCoreApplication objects void tst_QSql::open() { int i; @@ -158,7 +158,7 @@ void tst_QSql::open() char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; int count = -1; for (i = 0; i < 10; ++i) { - QGuiApplication app(argc, argv, false); + QCoreApplication app(argc, argv, false); tst_Databases dbs; dbs.open(); @@ -185,7 +185,7 @@ void tst_QSql::concurrentAccess() { int argc = 1; char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; - QGuiApplication app(argc, argv, false); + QCoreApplication app(argc, argv, false); tst_Databases dbs; dbs.open(); @@ -214,7 +214,7 @@ void tst_QSql::openErrorRecovery() { int argc = 1; char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; - QGuiApplication app(argc, argv, false); + QCoreApplication app(argc, argv, false); tst_Databases dbs; dbs.addDbs(); @@ -262,7 +262,7 @@ void tst_QSql::registerSqlDriver() { int argc = 1; char *argv[] = { const_cast<char*>(QTest::currentAppName()) }; - QGuiApplication app(argc, argv, false); + QCoreApplication app(argc, argv, false); QSqlDatabase::registerSqlDriver("QSQLTESTDRIVER", new QSqlDriverCreator<QSqlNullDriver>); QVERIFY(QSqlDatabase::drivers().contains("QSQLTESTDRIVER")); |