diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 11:06:01 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 11:06:01 +0200 |
commit | 6d4888bab754e3dd439599ed53c2a3ae900760e9 (patch) | |
tree | c517954fa3c1d34779bbdfbd46d09d0e5f358d7f /tests | |
parent | 1427884ac16febb8ee12d240236fb4f223902aea (diff) | |
parent | 3fd4dd035e3accfb8e6ef74e6f7543fcef42bef1 (diff) |
Merge branch 'refactor'
Conflicts:
demos/quick3d/robo_bounce/main.cpp
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml3d/qml3d.pro | 1 | ||||
-rw-r--r-- | tests/auto/qml3d/tst_qml3d.cpp | 2 | ||||
-rw-r--r-- | tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro | 3 | ||||
-rw-r--r-- | tests/auto/threed/qopenglfunctions/qopenglfunctions.pro | 2 | ||||
-rw-r--r-- | tests/auto/threed/qopenglfunctions/tst_qopenglfunctions.cpp | 1 | ||||
-rw-r--r-- | tests/auto/threed/qsphere3d/qsphere3d.pro | 1 | ||||
-rw-r--r-- | tests/auto/threed/qvectorarray/qvectorarray.pro | 2 | ||||
-rw-r--r-- | tests/manual/animations/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/displaymodel/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/model3ds/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/navigation1/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qrc/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/rotation/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/scaling/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/submesh/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/transformations/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/translation/main.cpp | 2 |
17 files changed, 21 insertions, 11 deletions
diff --git a/tests/auto/qml3d/qml3d.pro b/tests/auto/qml3d/qml3d.pro index 044d26a22..7768f1414 100644 --- a/tests/auto/qml3d/qml3d.pro +++ b/tests/auto/qml3d/qml3d.pro @@ -2,6 +2,7 @@ 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 d8757a392..f95928d97 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 <QtDeclarative/qdeclarativeview.h> +#include <QtQuick1/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 055406017..e4c607307 100644 --- a/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro +++ b/tests/auto/threed/qglcolladafxeffectfactory/qglcolladafxeffectfactory.pro @@ -1,8 +1,11 @@ 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 c830ff378..35d5ec21b 100644 --- a/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro +++ b/tests/auto/threed/qopenglfunctions/qopenglfunctions.pro @@ -1,6 +1,8 @@ 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 0ef539094..be89f021d 100644 --- a/tests/auto/threed/qopenglfunctions/tst_qopenglfunctions.cpp +++ b/tests/auto/threed/qopenglfunctions/tst_qopenglfunctions.cpp @@ -41,6 +41,7 @@ #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 d758dcf1c..92a9a4b12 100644 --- a/tests/auto/threed/qsphere3d/qsphere3d.pro +++ b/tests/auto/threed/qsphere3d/qsphere3d.pro @@ -1,5 +1,6 @@ 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 076771591..e668785d2 100644 --- a/tests/auto/threed/qvectorarray/qvectorarray.pro +++ b/tests/auto/threed/qvectorarray/qvectorarray.pro @@ -1,6 +1,8 @@ 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 bc89a00fa..5f8396999 100644 --- a/tests/manual/animations/main.cpp +++ b/tests/manual/animations/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" diff --git a/tests/manual/displaymodel/main.cpp b/tests/manual/displaymodel/main.cpp index b26d4eda4..d967a02d4 100644 --- a/tests/manual/displaymodel/main.cpp +++ b/tests/manual/displaymodel/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" diff --git a/tests/manual/model3ds/main.cpp b/tests/manual/model3ds/main.cpp index 2b2276c1b..472cff9a1 100644 --- a/tests/manual/model3ds/main.cpp +++ b/tests/manual/model3ds/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" diff --git a/tests/manual/navigation1/main.cpp b/tests/manual/navigation1/main.cpp index f3d6a8b92..1d25b0829 100644 --- a/tests/manual/navigation1/main.cpp +++ b/tests/manual/navigation1/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" diff --git a/tests/manual/qrc/main.cpp b/tests/manual/qrc/main.cpp index e56a21ed3..16c8855f4 100644 --- a/tests/manual/qrc/main.cpp +++ b/tests/manual/qrc/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include <QWidget> #include <QHBoxLayout> diff --git a/tests/manual/rotation/main.cpp b/tests/manual/rotation/main.cpp index 9c44b41e7..2d70a6c1f 100644 --- a/tests/manual/rotation/main.cpp +++ b/tests/manual/rotation/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" diff --git a/tests/manual/scaling/main.cpp b/tests/manual/scaling/main.cpp index b4112b44a..f1f90aab5 100644 --- a/tests/manual/scaling/main.cpp +++ b/tests/manual/scaling/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" diff --git a/tests/manual/submesh/main.cpp b/tests/manual/submesh/main.cpp index 67e68746c..61f6ed4db 100644 --- a/tests/manual/submesh/main.cpp +++ b/tests/manual/submesh/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" diff --git a/tests/manual/transformations/main.cpp b/tests/manual/transformations/main.cpp index 56ac5a466..041a7fb8e 100644 --- a/tests/manual/transformations/main.cpp +++ b/tests/manual/transformations/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" diff --git a/tests/manual/translation/main.cpp b/tests/manual/translation/main.cpp index 2755fd868..18e5e4ec5 100644 --- a/tests/manual/translation/main.cpp +++ b/tests/manual/translation/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "qdeclarativeview3d.h" #include "../../shared/qmlres.h" |