Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove unneeded dependencies to QtWidgets and QtOpenGL
Change-Id: I43bb54524f5786a838073df8812107dda7b0d56e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
  • Loading branch information
Lars Knoll authored and Qt by Nokia committed Mar 12, 2012
1 parent dda130f commit 16e29f3
Show file tree
Hide file tree
Showing 54 changed files with 47 additions and 61 deletions.
2 changes: 1 addition & 1 deletion tests/auto/particles/qquickage/qquickage.pro
Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

2 changes: 1 addition & 1 deletion tests/auto/particles/qquickfriction/qquickfriction.pro
Expand Up @@ -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

2 changes: 1 addition & 1 deletion tests/auto/particles/qquickgravity/qquickgravity.pro
Expand Up @@ -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

2 changes: 1 addition & 1 deletion tests/auto/particles/qquickgroupgoal/qquickgroupgoal.pro
Expand Up @@ -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

Expand Up @@ -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
Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

2 changes: 1 addition & 1 deletion tests/auto/particles/qquickspritegoal/qquickspritegoal.pro
Expand Up @@ -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

Expand Up @@ -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

Expand Up @@ -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

2 changes: 1 addition & 1 deletion tests/auto/particles/qquickturbulence/qquickturbulence.pro
Expand Up @@ -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

2 changes: 1 addition & 1 deletion tests/auto/particles/qquickwander/qquickwander.pro
Expand Up @@ -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

2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/qml/qqmlincubator/qqmlincubator.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/qml/qqmlinfo/qqmlinfo.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/qml/qqmlmetatype/qqmlmetatype.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/qml/qqmlproperty/qqmlproperty.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/qml/qquickconnection/qquickconnection.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/qml/qquicklistmodel/qquicklistmodel.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/examples/examples.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/geometry/geometry.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickanimations/qquickanimations.pro
Expand Up @@ -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
6 changes: 0 additions & 6 deletions tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
Expand Up @@ -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"));
Expand Down Expand Up @@ -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"));
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickbehaviors/qquickbehaviors.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickborderimage/qquickborderimage.pro
Expand Up @@ -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
Expand Up @@ -43,7 +43,6 @@
#include <QTcpServer>
#include <QTcpSocket>
#include <QDir>
#include <QGraphicsScene>
#include <QPainter>

#include <QtQml/qqmlengine.h>
Expand Down
2 changes: 1 addition & 1 deletion 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

Expand Down
1 change: 0 additions & 1 deletion tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickgridview/qquickgridview.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickitem/qquickitem.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickitem2/qquickitem2.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/qquicklistview/qquicklistview.pro
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickpositioners/qquickpositioners.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickshadereffect/qquickshadereffect.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/qquickstates/qquickstates.pro
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/auto/quick/qquicktext/qquicktext.pro
Expand Up @@ -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
3 changes: 1 addition & 2 deletions tests/auto/quick/qquicktext/tst_qquicktext.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/quick/qquicktextedit/qquicktextedit.pro
Expand Up @@ -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
1 change: 0 additions & 1 deletion tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
Expand Up @@ -55,7 +55,6 @@
#include <QFontMetrics>
#include <QtQuick/QQuickView>
#include <QDir>
#include <QStyle>
#include <QInputMethod>
#include <QClipboard>
#include <QMimeData>
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/quick/qquicktextinput/qquicktextinput.pro
Expand Up @@ -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
2 changes: 0 additions & 2 deletions tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
Expand Up @@ -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
Expand Down

0 comments on commit 16e29f3

Please sign in to comment.