diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-02-29 20:43:09 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 17:04:36 +0100 |
commit | 16e29f30e3483568a36dba7b37520ea1645d9a2e (patch) | |
tree | a257718cd250e21fed828d08b5c825a9fe2d83f9 /tests/auto/quick | |
parent | dda130fb2f01b3ed6f8833c3d6522b1a494d9641 (diff) |
Remove unneeded dependencies to QtWidgets and QtOpenGL
Change-Id: I43bb54524f5786a838073df8812107dda7b0d56e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'tests/auto/quick')
24 files changed, 17 insertions, 31 deletions
diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro index 5907ba291c..c320fdad9e 100644 --- a/tests/auto/quick/examples/examples.pro +++ b/tests/auto/quick/examples/examples.pro @@ -7,6 +7,6 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary -QT += core-private gui-private qml-private quick-private widgets-private v8-private testlib +QT += core-private gui-private qml-private quick-private v8-private testlib cross_compile: DEFINES += QTEST_CROSS_COMPILED diff --git a/tests/auto/quick/geometry/geometry.pro b/tests/auto/quick/geometry/geometry.pro index 41fcab7c8f..0b7e64d038 100644 --- a/tests/auto/quick/geometry/geometry.pro +++ b/tests/auto/quick/geometry/geometry.pro @@ -6,4 +6,4 @@ SOURCES += tst_geometry.cpp CONFIG+=parallel_test -QT += core-private gui-private qml-private quick-private opengl testlib +QT += core-private gui-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickanimations/qquickanimations.pro b/tests/auto/quick/qquickanimations/qquickanimations.pro index d9c3ea28c1..5c0bd3a2d4 100644 --- a/tests/auto/quick/qquickanimations/qquickanimations.pro +++ b/tests/auto/quick/qquickanimations/qquickanimations.pro @@ -10,7 +10,7 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private v8-private qml-private quick-private testlib widgets # QTBUG-23385 - color mixing tests failing on Ubuntu 11.10 x64 linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp index dd010999b4..d71100d120 100644 --- a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp +++ b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp @@ -190,9 +190,6 @@ void tst_qquickanimations::simpleColor() QVERIFY(animation.isPaused()); animation.setCurrentTime(125); QVERIFY(animation.currentTime() == 125); -#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__) - QEXPECT_FAIL("", "Fails on this platform - QTBUG-23385", Abort); -#endif QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1)); rect.setColor(QColor("green")); @@ -746,9 +743,6 @@ void tst_qquickanimations::mixedTypes() //rather inexact -- is there a better way? QVERIFY(myRect->x() > 100 && myRect->x() < 200); -#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__) - QEXPECT_FAIL("", "Fails on this platform - QTBUG-23385", Continue); -#endif QVERIFY(myRect->color() != QColor("red") && myRect->color() != QColor("blue")); } } diff --git a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro index dcffad6cd9..e8165c271c 100644 --- a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro +++ b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro @@ -10,4 +10,4 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickborderimage/qquickborderimage.pro b/tests/auto/quick/qquickborderimage/qquickborderimage.pro index c967d579e5..998b66f89b 100644 --- a/tests/auto/quick/qquickborderimage/qquickborderimage.pro +++ b/tests/auto/quick/qquickborderimage/qquickborderimage.pro @@ -12,4 +12,4 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private qml-private quick-private network widgets testlib +QT += core-private gui-private qml-private quick-private network testlib diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp index 13b12f6020..173f230203 100644 --- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp @@ -43,7 +43,6 @@ #include <QTcpServer> #include <QTcpSocket> #include <QDir> -#include <QGraphicsScene> #include <QPainter> #include <QtQml/qqmlengine.h> diff --git a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro index b0122f997a..6d5706b9f7 100644 --- a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro +++ b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro @@ -1,4 +1,4 @@ -QT += core-private gui-private qml-private widgets +QT += core-private gui-private qml-private TEMPLATE=app TARGET=tst_qquickcanvasitem diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index e46659e6d0..a2ecadf33a 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -50,7 +50,6 @@ #include "../../shared/util.h" #include "../shared/viewtestutil.h" #include "../shared/visualtestutil.h" -#include <QtOpenGL/QGLShaderProgram> using namespace QQuickViewTestUtil; using namespace QQuickVisualTestUtil; diff --git a/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp b/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp index 2f399359ef..4fe155168a 100644 --- a/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp +++ b/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp @@ -47,7 +47,6 @@ #include <QFontMetrics> #include <QtQuick/private/qquickrectangle_p.h> #include <math.h> -#include <QtOpenGL/QGLShaderProgram> #include "../../shared/util.h" class tst_qquickflipable : public QQmlDataTest diff --git a/tests/auto/quick/qquickgridview/qquickgridview.pro b/tests/auto/quick/qquickgridview/qquickgridview.pro index b4a234e35a..ed2007d734 100644 --- a/tests/auto/quick/qquickgridview/qquickgridview.pro +++ b/tests/auto/quick/qquickgridview/qquickgridview.pro @@ -10,4 +10,4 @@ include (../shared/util.pri) TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib widgets +QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro index cbbd6e586b..ee40be6a2e 100644 --- a/tests/auto/quick/qquickitem/qquickitem.pro +++ b/tests/auto/quick/qquickitem/qquickitem.pro @@ -9,4 +9,4 @@ macx:CONFIG -= app_bundle TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private widgets testlib +QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickitem2/qquickitem2.pro b/tests/auto/quick/qquickitem2/qquickitem2.pro index 887c8796a8..589d1bd568 100644 --- a/tests/auto/quick/qquickitem2/qquickitem2.pro +++ b/tests/auto/quick/qquickitem2/qquickitem2.pro @@ -10,4 +10,4 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquicklistview/qquicklistview.pro b/tests/auto/quick/qquicklistview/qquicklistview.pro index d4d97e2106..c1b24baed4 100644 --- a/tests/auto/quick/qquicklistview/qquicklistview.pro +++ b/tests/auto/quick/qquicklistview/qquicklistview.pro @@ -11,4 +11,4 @@ include (../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private qml-private quick-private widgets widgets-private v8-private opengl-private testlib +QT += core-private gui-private qml-private quick-private v8-private testlib diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 82563b07f9..a4b04bb88a 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -47,7 +47,6 @@ #include <QtQuick/qquickview.h> #include <QtQml/qqmlcontext.h> #include <QtQml/qqmlengine.h> -#include <QtOpenGL/QGLShaderProgram> #include "../../shared/util.h" //#define OLDWAY diff --git a/tests/auto/quick/qquickpositioners/qquickpositioners.pro b/tests/auto/quick/qquickpositioners/qquickpositioners.pro index 243d03484a..dbbfae0ebf 100644 --- a/tests/auto/quick/qquickpositioners/qquickpositioners.pro +++ b/tests/auto/quick/qquickpositioners/qquickpositioners.pro @@ -10,4 +10,4 @@ macx:CONFIG -= app_bundle TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickshadereffect/qquickshadereffect.pro b/tests/auto/quick/qquickshadereffect/qquickshadereffect.pro index 6ff50a0553..142d368aed 100644 --- a/tests/auto/quick/qquickshadereffect/qquickshadereffect.pro +++ b/tests/auto/quick/qquickshadereffect/qquickshadereffect.pro @@ -5,4 +5,4 @@ SOURCES += tst_qquickshadereffect.cpp macx:CONFIG -= app_bundle CONFIG += parallel_test -QT += core-private gui-private qml-private quick-private widgets testlib +QT += core-private gui-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickstates/qquickstates.pro b/tests/auto/quick/qquickstates/qquickstates.pro index 5f2b8cd2de..783e1097dd 100644 --- a/tests/auto/quick/qquickstates/qquickstates.pro +++ b/tests/auto/quick/qquickstates/qquickstates.pro @@ -9,4 +9,4 @@ include (../../shared/util.pri) TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquicktext/qquicktext.pro b/tests/auto/quick/qquicktext/qquicktext.pro index 53e170a115..8932664fa3 100644 --- a/tests/auto/quick/qquicktext/qquicktext.pro +++ b/tests/auto/quick/qquicktext/qquicktext.pro @@ -14,4 +14,4 @@ TESTDATA = data/* CONFIG += parallel_test -QT += core-private gui-private v8-private qml-private quick-private widgets-private opengl-private network testlib +QT += core-private gui-private v8-private qml-private quick-private network testlib diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 54b5a04466..92e8528a0d 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -47,10 +47,9 @@ #include <private/qquicktext_p_p.h> #include <private/qqmlvaluetype_p.h> #include <QFontMetrics> -#include <QGraphicsSceneMouseEvent> #include <qmath.h> #include <QtQuick/QQuickView> -#include <private/qapplication_p.h> +#include <private/qguiapplication_p.h> #include <limits.h> #include <QtGui/QMouseEvent> #include "../../shared/util.h" diff --git a/tests/auto/quick/qquicktextedit/qquicktextedit.pro b/tests/auto/quick/qquicktextedit/qquicktextedit.pro index 23459f2a91..83250030de 100644 --- a/tests/auto/quick/qquicktextedit/qquicktextedit.pro +++ b/tests/auto/quick/qquicktextedit/qquicktextedit.pro @@ -11,4 +11,4 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private opengl-private network widgets-private testlib +QT += core-private gui-private v8-private qml-private quick-private network-private testlib diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index c98e5ebf8e..a90b23dfd7 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -55,7 +55,6 @@ #include <QFontMetrics> #include <QtQuick/QQuickView> #include <QDir> -#include <QStyle> #include <QInputMethod> #include <QClipboard> #include <QMimeData> diff --git a/tests/auto/quick/qquicktextinput/qquicktextinput.pro b/tests/auto/quick/qquicktextinput/qquicktextinput.pro index 046e6abcad..13b087eef5 100644 --- a/tests/auto/quick/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/quick/qquicktextinput/qquicktextinput.pro @@ -8,4 +8,4 @@ include (../../shared/util.pri) TESTDATA = data/* -QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib +QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index bdd18d620e..c5db92af45 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -53,8 +53,6 @@ #include <private/qquicktextinput_p_p.h> #include <QDebug> #include <QDir> -#include <QStyle> -#include <QtOpenGL/QGLShaderProgram> #include <math.h> #ifdef Q_OS_MAC |