Revert "Merge branch 'refactor'"

This reverts commit 6d4888bab754e3dd439599ed53c2a3ae900760e9, reversing
changes made to 1427884ac16febb8ee12d240236fb4f223902aea.

Change-Id: I3fc9981f8c76a36feeaba6e83bcffdea03fd09fd
Reviewed-on: http://codereview.qt-project.org/4930
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>

17 files changed, 11 insertions, 21 deletions

diff --git a/tests/auto/qml3d/qml3d.pro b/tests/auto/qml3d/qml3d.pro
index 62a611152..6b80971bd 100644
--- a/tests/auto/qml3d/qml3d.pro
+++ b/tests/auto/qml3d/qml3d.pro
@@ -2,7 +2,6 @@ load(qttest_p4.prf)
 TEMPLATE=app
 CONFIG += unittest warn_on
 QT += declarative opengl
-QT += qtquick1
 SOURCES += tst_qml3d.cpp
 DEFINES += QML3D_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\"
 win32:DEFINES+=_CRT_SECURE_NO_WARNINGS
diff --git a/tests/auto/qml3d/tst_qml3d.cpp b/tests/auto/qml3d/tst_qml3d.cpp
index f95928d97..d8757a392 100644
--- a/tests/auto/qml3d/tst_qml3d.cpp
+++ b/tests/auto/qml3d/tst_qml3d.cpp
@@ -41,7 +41,7 @@
 
 #include <QApplication>
 #include <QtDeclarative/qdeclarative.h>
-#include <QtQuick1/qdeclarativeview.h>
+#include <QtDeclarative/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtOpenGL/qgl.h>
diff --git a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
index e4c607307..055406017 100644
--- a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
+++ b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro
@@ -1,11 +1,8 @@
 load(qttest_p4.prf)
 TEMPLATE = app
 QT += testlib
-QT += opengl
-
 CONFIG += unittest warn_on qt3d
 
-
 INCLUDEPATH += ../../../../demos/shaderwizard/
 VPATH += ../../../../demos/shaderwizard/
 
diff --git a/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro b/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro
index 35d5ec21b..c830ff378 100644
--- a/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro
+++ b/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro
@@ -1,8 +1,6 @@
 load(qttest_p4.prf)
 TEMPLATE=app
 QT += testlib
-QT += opengl
-
 CONFIG += unittest warn_on qt3d
 
 SOURCES += tst_qopenglfunctions.cpp
diff --git a/tests/auto/threed/qopenglfunctions/tst_qopenglfunctions.cpp b/tests/auto/threed/qopenglfunctions/tst_qopenglfunctions.cpp
index be89f021d..0ef539094 100644
--- a/tests/auto/threed/qopenglfunctions/tst_qopenglfunctions.cpp
+++ b/tests/auto/threed/qopenglfunctions/tst_qopenglfunctions.cpp
@@ -41,7 +41,6 @@
 
 #include <QtTest/QtTest>
 #include "qopenglfunctions.h"
-#include <QtOpenGL>
 
 class tst_QOpenGLFunctions : public QObject
 {
diff --git a/tests/auto/threed/qsphere3d/qsphere3d.pro b/tests/auto/threed/qsphere3d/qsphere3d.pro
index 92a9a4b12..d758dcf1c 100644
--- a/tests/auto/threed/qsphere3d/qsphere3d.pro
+++ b/tests/auto/threed/qsphere3d/qsphere3d.pro
@@ -1,6 +1,5 @@
 load(qttest_p4.prf)
 TEMPLATE=app
 QT += testlib
-QT += opengl
 CONFIG += unittest warn_on qt3d
 SOURCES += tst_qsphere3d.cpp
diff --git a/tests/auto/threed/qvectorarray/qvectorarray.pro b/tests/auto/threed/qvectorarray/qvectorarray.pro
index e668785d2..076771591 100644
--- a/tests/auto/threed/qvectorarray/qvectorarray.pro
+++ b/tests/auto/threed/qvectorarray/qvectorarray.pro
@@ -1,8 +1,6 @@
 load(qttest_p4.prf)
 TEMPLATE=app
 QT += testlib
-QT += opengl
-
 CONFIG += unittest warn_on qt3d
 
 INCLUDEPATH += ../../../shared
diff --git a/tests/manual/animations/main.cpp b/tests/manual/animations/main.cpp
index 5f8396999..bc89a00fa 100644
--- a/tests/manual/animations/main.cpp
+++ b/tests/manual/animations/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
diff --git a/tests/manual/displaymodel/main.cpp b/tests/manual/displaymodel/main.cpp
index d967a02d4..b26d4eda4 100644
--- a/tests/manual/displaymodel/main.cpp
+++ b/tests/manual/displaymodel/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
diff --git a/tests/manual/model3ds/main.cpp b/tests/manual/model3ds/main.cpp
index 472cff9a1..2b2276c1b 100644
--- a/tests/manual/model3ds/main.cpp
+++ b/tests/manual/model3ds/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
diff --git a/tests/manual/navigation1/main.cpp b/tests/manual/navigation1/main.cpp
index 1d25b0829..f3d6a8b92 100644
--- a/tests/manual/navigation1/main.cpp
+++ b/tests/manual/navigation1/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
diff --git a/tests/manual/qrc/main.cpp b/tests/manual/qrc/main.cpp
index 16c8855f4..e56a21ed3 100644
--- a/tests/manual/qrc/main.cpp
+++ b/tests/manual/qrc/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 #include <QWidget>
 #include <QHBoxLayout>
diff --git a/tests/manual/rotation/main.cpp b/tests/manual/rotation/main.cpp
index 2d70a6c1f..9c44b41e7 100644
--- a/tests/manual/rotation/main.cpp
+++ b/tests/manual/rotation/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
diff --git a/tests/manual/scaling/main.cpp b/tests/manual/scaling/main.cpp
index f1f90aab5..b4112b44a 100644
--- a/tests/manual/scaling/main.cpp
+++ b/tests/manual/scaling/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
diff --git a/tests/manual/submesh/main.cpp b/tests/manual/submesh/main.cpp
index 61f6ed4db..67e68746c 100644
--- a/tests/manual/submesh/main.cpp
+++ b/tests/manual/submesh/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
diff --git a/tests/manual/transformations/main.cpp b/tests/manual/transformations/main.cpp
index 041a7fb8e..56ac5a466 100644
--- a/tests/manual/transformations/main.cpp
+++ b/tests/manual/transformations/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"
diff --git a/tests/manual/translation/main.cpp b/tests/manual/translation/main.cpp
index 18e5e4ec5..2755fd868 100644
--- a/tests/manual/translation/main.cpp
+++ b/tests/manual/translation/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QtGui/QApplication>
 #include "qdeclarativeview3d.h"
 
 #include "../../shared/qmlres.h"