Make QtQuickTest compile with qtestlib in Qt

6 files changed, 14 insertions, 15 deletions

diff --git a/src/quicktestlib/testlib/qtestoptions_p.h b/src/quicktestlib/qtestoptions_p.h
index 2af40ef..167f906 100644
--- a/src/quicktestlib/testlib/qtestoptions_p.h
+++ b/src/quicktestlib/qtestoptions_p.h
@@ -42,7 +42,7 @@
 #ifndef QTESTOPTIONS_P_H
 #define QTESTOPTIONS_P_H
 
-#include "qtest_global.h"
+#include <QtTest/qtest_global.h>
 
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
diff --git a/src/quicktestlib/quicktest.cpp b/src/quicktestlib/quicktest.cpp
index 147f4fb..ffb269d 100644
--- a/src/quicktestlib/quicktest.cpp
+++ b/src/quicktestlib/quicktest.cpp
@@ -41,7 +41,7 @@
 
 #include "quicktest.h"
 #include "quicktestresult_p.h"
-#include "qtestsystem.h"
+#include <QtTest/qtestsystem.h>
 #include "qtestoptions_p.h"
 #include <QApplication>
 #include <QtDeclarative/qdeclarative.h>
diff --git a/src/quicktestlib/quicktestevent.cpp b/src/quicktestlib/quicktestevent.cpp
index 83aff91..894e29e 100644
--- a/src/quicktestlib/quicktestevent.cpp
+++ b/src/quicktestlib/quicktestevent.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "quicktestevent_p.h"
-#include "qtestkeyboard.h"
+#include <QtTest/qtestkeyboard.h>
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativeitem.h>
 #include <QtDeclarative/qdeclarativeview.h>
diff --git a/src/quicktestlib/quicktestlib.pro b/src/quicktestlib/quicktestlib.pro
index 9a1c3e0..f29d1a2 100644
--- a/src/quicktestlib/quicktestlib.pro
+++ b/src/quicktestlib/quicktestlib.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 TARGET = QtQuickTest$${QT_LIBINFIX}
 CONFIG += dll warn_on
-QT += declarative script
+QT += declarative script testlib
 DESTDIR = ../../lib
 
 win32 {
@@ -35,13 +35,12 @@ HEADERS += \
     QtQuickTest/quicktest.h
 PRIVATE_HEADERS += \
     quicktestevent_p.h \
-    quicktestresult_p.h
+    quicktestresult_p.h \
+    qtestoptions_p.h
 
 PUBLIC_HEADERS += $$HEADERS
 HEADERS += $$PRIVATE_HEADERS
 
-include(testlib/testlib.pri)
-
 DEFINES += QT_BUILD_QUICK_TEST_LIB
 
 !symbian {
diff --git a/src/quicktestlib/quicktestlib_dep.pri b/src/quicktestlib/quicktestlib_dep.pri
index 9f60c4a..543d5af 100644
--- a/src/quicktestlib/quicktestlib_dep.pri
+++ b/src/quicktestlib/quicktestlib_dep.pri
@@ -1,5 +1,5 @@
 
-QT += declarative
+QT += declarative testlib
 
 INCLUDEPATH += $$PWD
 LIBS += -L../../lib -L../../bin
diff --git a/src/quicktestlib/quicktestresult.cpp b/src/quicktestlib/quicktestresult.cpp
index 0ceb191..59fea96 100644
--- a/src/quicktestlib/quicktestresult.cpp
+++ b/src/quicktestlib/quicktestresult.cpp
@@ -40,14 +40,14 @@
 ****************************************************************************/
 
 #include "quicktestresult_p.h"
-#include "qtestcase.h"
-#include "qtestsystem.h"
-#include "qtestresult_p.h"
-#include "qtesttable_p.h"
-#include "qtestlog_p.h"
+#include <QtTest/qtestcase.h>
+#include <QtTest/qtestsystem.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qtesttable_p.h>
+#include <QtTest/private/qtestlog_p.h>
 #include "qtestoptions_p.h"
-#include "qbenchmark.h"
-#include "qbenchmark_p.h"
+#include <QtTest/qbenchmark.h>
+#include <QtTest/private/qbenchmark_p.h>
 #include <QtCore/qset.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qbytearray.h>