Remove unneeded dependencies to QtWidgets and QtOpenGL

Change-Id: I43bb54524f5786a838073df8812107dda7b0d56e Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2012-02-29 20:43:09 +01:00 · 2012-02-29 20:43:09 +01:00 · 16e29f30e3
parent dda130fb2f
commit 16e29f30e3
54 changed files with 47 additions and 61 deletions
--- a/tests/auto/particles/qquickage/qquickage.pro
+++ b/tests/auto/particles/qquickage/qquickage.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro
+++ b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro
+++ b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro
+++ b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro
+++ b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro
+++ b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickfriction/qquickfriction.pro
+++ b/tests/auto/particles/qquickfriction/qquickfriction.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickgravity/qquickgravity.pro
+++ b/tests/auto/particles/qquickgravity/qquickgravity.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
+++ b/tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 include (../../shared/util.pri)
 TESTDATA = data/*

-QT += core-private gui-private v8-private qml-private opengl-private testlib
+QT += core-private gui-private v8-private qml-private testlib

--- a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro
+++ b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro
@ -6,4 +6,4 @@ macx:CONFIG -= app_bundle
 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
--- a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro
+++ b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro
+++ b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro
+++ b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro
+++ b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro
+++ b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro
+++ b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro
+++ b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro
+++ b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
+++ b/tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 include (../../shared/util.pri)
 TESTDATA = data/*

-QT += core-private gui-private v8-private qml-private opengl-private testlib
+QT += core-private gui-private v8-private qml-private testlib

--- a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro
+++ b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro
+++ b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickturbulence/qquickturbulence.pro
+++ b/tests/auto/particles/qquickturbulence/qquickturbulence.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/particles/qquickwander/qquickwander.pro
+++ b/tests/auto/particles/qquickwander/qquickwander.pro
@ -6,5 +6,5 @@ macx:CONFIG -= app_bundle
 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

--- a/tests/auto/qml/debugger/qqmlinspector/app/app.pro
+++ b/tests/auto/qml/debugger/qqmlinspector/app/app.pro
@ -1,5 +1,5 @@
 TARGET = app
-QT += qml quick widgets
+QT += qml quick

 CONFIG += declarative_debug
 macx:CONFIG -= app_bundle
--- a/tests/auto/qml/qqmlincubator/qqmlincubator.pro
+++ b/tests/auto/qml/qqmlincubator/qqmlincubator.pro
@ -13,4 +13,4 @@ TESTDATA = data/*

 CONFIG += parallel_test

-QT += core-private gui-private v8-private qml-private network widgets testlib
+QT += core-private gui-private v8-private qml-private network testlib
--- a/tests/auto/qml/qqmlinfo/qqmlinfo.pro
+++ b/tests/auto/qml/qqmlinfo/qqmlinfo.pro
@ -9,4 +9,4 @@ include (../../shared/util.pri)
 TESTDATA = data/*

 CONFIG += parallel_test
-QT += core-private gui-private qml-private widgets testlib
+QT += core-private gui-private qml-private testlib
--- a/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro
+++ b/tests/auto/qml/qqmlmetatype/qqmlmetatype.pro
@ -4,4 +4,4 @@ SOURCES += tst_qqmlmetatype.cpp
 macx:CONFIG -= app_bundle

 CONFIG += parallel_test
-QT += core-private gui-private qml-private widgets testlib
+QT += core-private gui-private qml-private testlib
--- a/tests/auto/qml/qqmlproperty/qqmlproperty.pro
+++ b/tests/auto/qml/qqmlproperty/qqmlproperty.pro
@ -10,4 +10,4 @@ TESTDATA = data/*

 CONFIG += parallel_test

-QT += core-private gui-private v8-private qml-private widgets testlib
+QT += core-private gui-private v8-private qml-private testlib
--- a/tests/auto/qml/qquickconnection/qquickconnection.pro
+++ b/tests/auto/qml/qquickconnection/qquickconnection.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
--- a/tests/auto/qml/qquicklistmodel/qquicklistmodel.pro
+++ b/tests/auto/qml/qquicklistmodel/qquicklistmodel.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
--- 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
--- 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
--- 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
--- 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"));
    }
 }
--- 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
--- 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
--- 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>
--- 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

--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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>
--- 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
--- 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