summaryrefslogtreecommitdiffstats
path: root/tests/auto/sql/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/sql/kernel')
-rw-r--r--tests/auto/sql/kernel/qsql/tst_qsql.cpp2
-rw-r--r--tests/auto/sql/kernel/qsqldatabase/tst_databases.h5
-rw-r--r--tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp4
-rw-r--r--tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp2
-rw-r--r--tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp2
-rw-r--r--tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp2
-rw-r--r--tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp2
-rw-r--r--tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp2
-rw-r--r--tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp2
-rw-r--r--tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp2
10 files changed, 15 insertions, 10 deletions
diff --git a/tests/auto/sql/kernel/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
index 2ce43b85a7..a8eca14f49 100644
--- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp
+++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qcoreapplication.h>
#include <qsqldatabase.h>
#include <qsqlerror.h>
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index d17c47879d..74fa06ab29 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -41,8 +41,11 @@
#include <QVariant>
#include <QDebug>
#include <QSqlTableModel>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonDocument>
#include <QtSql/private/qsqldriver_p.h>
-#include <QtTest/QtTest>
+#include <QTest>
#define CHECK_DATABASE( db ) \
if ( !db.isValid() ) { qFatal( "db is Invalid" ); }
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 4e6664faa0..fbc7d2bcbe 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -27,7 +27,9 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
+
#include <qsqldatabase.h>
#include <qsqlquery.h>
#include <qsqldriver.h>
diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
index 508a1d8403..70e5b43845 100644
--- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtSql/QtSql>
#include "../qsqldatabase/tst_databases.h"
diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index db64e5aa47..ab7489a145 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qcoreapplication.h>
#include <qdebug.h>
diff --git a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
index 0be74c126c..09e33cebee 100644
--- a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
+++ b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <qsqlfield.h>
#include <qvariant.h>
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index 352687a369..edb6a2747a 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -26,7 +26,7 @@
**
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtSql/QtSql>
#include <numeric>
diff --git a/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
index ed259f3cde..ac71e0edc2 100644
--- a/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
+++ b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include "qsqlrecord.h"
#include "qsqlfield.h"
diff --git a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
index 6c68a71654..cae8491b81 100644
--- a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
+++ b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp
@@ -26,7 +26,7 @@
**
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include <QtSql/QtSql>
#include "testsqldriver.h"
diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index a8a0a453e2..163e433bd1 100644
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
@@ -27,7 +27,7 @@
****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
#include "../qsqldatabase/tst_databases.h"