1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix autotest gui/widgets dependencies

Browse Source 
This is in preparation of removing testlib's
dependency on QtGui and QtWidgets.

Autotests that need QtWidgets api must
explicitly include it (since the types are no
longer provided by the QtGui master header).

Autotests that don't need QtGui or QtWidgets
api shouldn't link against those libraries.

Change-Id: I2808289068514fcac582808828ad4634e2631733
Reviewed-on: http://codereview.qt-project.org/5093
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Kent Hansen 2011-09-16 14:07:05 +02:00 committed by Qt by Nokia
parent 39a6ff81bc
commit b8d656d878
49 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -45,12 +45,12 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <private/qsettings_p.h> #include <private/qsettings_p.h>
//#include <QtGui/QApplication>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QtGlobal> #include <QtCore/QtGlobal>
#include <QtCore/QMetaType> #include <QtCore/QMetaType>
#include <QtCore/QtDebug> #include <QtCore/QtDebug>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtGui/QKeySequence>
#include "../../../../shared/util.h" #include "../../../../shared/util.h"
#if !defined(Q_OS_SYMBIAN) #if !defined(Q_OS_SYMBIAN)

1
tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp
View File

@ -43,6 +43,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <QtSql/QtSql> #include <QtSql/QtSql>
#include <QtWidgets/QtWidgets>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
/* /*

2
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -3313,7 +3313,7 @@ void tst_QObject::deleteQObjectWhenDeletingEvent()
}; };
QObject o; QObject o;
QApplication::postEvent(&o, new MyEvent); QGuiApplication::postEvent(&o, new MyEvent);
QCoreApplication::removePostedEvents(&o); // here you would get a deadlock QCoreApplication::removePostedEvents(&o); // here you would get a deadlock
} }

1
tests/auto/corelib/tools/qlist/qlist.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT = core
SOURCES += tst_qlist.cpp SOURCES += tst_qlist.cpp

1
tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
View File

@ -40,6 +40,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <stddef.h> #include <stddef.h>

1
tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro
View File

@ -1,3 +1,2 @@
TEMPLATE = subdirs TEMPLATE = subdirs
QT += widgets
SUBDIRS = test qfileopeneventexternal SUBDIRS = test qfileopeneventexternal

2
tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
View File

@ -40,7 +40,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QEvent> #include <QtGui/qevent.h>
#ifdef Q_OS_SYMBIAN #ifdef Q_OS_SYMBIAN
#include <apgcli.h> #include <apgcli.h>

1
tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
View File

@ -40,6 +40,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <QtTest> #include <QtTest>
class tst_QTouchEventWidget : public QWidget class tst_QTouchEventWidget : public QWidget

1
tests/auto/gui/painting/qpainter/tst_qpainter.cpp
View File

@ -44,6 +44,7 @@
#include "../../../../shared/util.h" #include "../../../../shared/util.h"
#include <qpainter.h> #include <qpainter.h>
#include <qdrawutil.h>
#include <qapplication.h> #include <qapplication.h>
#include <qwidget.h> #include <qwidget.h>
#include <qfontmetrics.h> #include <qfontmetrics.h>

2
tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
View File

@ -43,6 +43,8 @@
#if defined(Q_OS_WINCE) #if defined(Q_OS_WINCE)
#include <QtGui/QFontDatabase> #include <QtGui/QFontDatabase>
#endif #endif
#include <QtGui/QFontInfo>
#include <QtGui/QFontMetrics>
//TESTED_CLASS=QCss //TESTED_CLASS=QCss
//TESTED_FILES=gui/text/qcssparser.cpp gui/text/qcssparser_p.h //TESTED_FILES=gui/text/qcssparser.cpp gui/text/qcssparser_p.h

4
tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
View File

@ -44,6 +44,8 @@
#include <qfontdatabase.h> #include <qfontdatabase.h>
#include <qfontinfo.h>
#include <qfontmetrics.h>
#ifdef Q_OS_SYMBIAN #ifdef Q_OS_SYMBIAN
#define SRCDIR "." #define SRCDIR "."
@ -232,7 +234,7 @@ void tst_QFontDatabase::addAppFont_data()
void tst_QFontDatabase::addAppFont() void tst_QFontDatabase::addAppFont()
{ {
QFETCH(bool, useMemoryFont); QFETCH(bool, useMemoryFont);
QSignalSpy fontDbChangedSpy(QApplication::instance(), SIGNAL(fontDatabaseChanged())); QSignalSpy fontDbChangedSpy(QGuiApplication::instance(), SIGNAL(fontDatabaseChanged()));
QFontDatabase db; QFontDatabase db;

2
tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
View File

@ -2469,7 +2469,7 @@ void tst_QTextDocumentFragment::html_anchorColor()
setHtml("<span style=\"color: red;\"><a href=\"http://www.kde.org/\">Blue</a></span>"); setHtml("<span style=\"color: red;\"><a href=\"http://www.kde.org/\">Blue</a></span>");
cursor.movePosition(QTextCursor::Start); cursor.movePosition(QTextCursor::Start);
cursor.movePosition(QTextCursor::NextCharacter); cursor.movePosition(QTextCursor::NextCharacter);
QVERIFY(cursor.charFormat().foreground().color() == QApplication::palette().link().color()); QVERIFY(cursor.charFormat().foreground().color() == QGuiApplication::palette().link().color());
setHtml("<span style=\"color: red;\"><a href=\"http://www.kde.org/\" style=\"color: yellow;\">Green</a></span>"); setHtml("<span style=\"color: red;\"><a href=\"http://www.kde.org/\" style=\"color: yellow;\">Green</a></span>");
cursor.movePosition(QTextCursor::Start); cursor.movePosition(QTextCursor::Start);

1
tests/auto/modeltest/tst_modeltest.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#include "modeltest.h" #include "modeltest.h"
#include "dynamictreemodel.h" #include "dynamictreemodel.h"

1
tests/auto/qaccessibility/tst_qaccessibility.cpp
View File

@ -44,6 +44,7 @@
#ifndef Q_OS_WINCE #ifndef Q_OS_WINCE
#include "../../shared/util.h" #include "../../shared/util.h"
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <math.h> #include <math.h>
#if defined(Q_OS_WIN) && defined(interface) #if defined(Q_OS_WIN) && defined(interface)

1
tests/auto/qapplication/tst_qapplication.cpp
View File

@ -47,6 +47,7 @@
#include "qabstracteventdispatcher.h" #include "qabstracteventdispatcher.h"
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include "private/qapplication_p.h" #include "private/qapplication_p.h"
#include "private/qstylesheetstyle_p.h" #include "private/qstylesheetstyle_p.h"

1
tests/auto/qboxlayout/tst_qboxlayout.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui> #include <QtGui>
#include <QtWidgets>
//TESTED_CLASS= //TESTED_CLASS=
//TESTED_FILES= //TESTED_FILES=

1
tests/auto/qcolordialog/tst_qcolordialog.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QColorDialog>
#include "../../shared/util.h" #include "../../shared/util.h"

3
tests/auto/qcompleter/tst_qcompleter.cpp
View File

@ -38,11 +38,10 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui>
#include "qcompleter.h"
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <QtDebug> #include <QtDebug>
#include <QPair> #include <QPair>
#include <QList> #include <QList>

1
tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
View File

@ -39,6 +39,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#include <QtTest/QtTest> #include <QtTest/QtTest>
class tst_QDataWidgetMapper: public QObject class tst_QDataWidgetMapper: public QObject

4
tests/auto/qformlayout/tst_qformlayout.cpp
View File

@ -47,6 +47,10 @@
#include <qwindowsstyle.h> #include <qwindowsstyle.h>
#include <qsizepolicy.h> #include <qsizepolicy.h>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QPlastiqueStyle>
#include <QtWidgets/QWindowsStyle> #include <QtWidgets/QWindowsStyle>
#include <QStyleFactory> #include <QStyleFactory>

1
tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <math.h> #include <math.h>
#include "../../shared/util.h" #include "../../shared/util.h"

1
tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include "../../shared/util.h" #include "../../shared/util.h"
#include <private/qgraphicsproxywidget_p.h> #include <private/qgraphicsproxywidget_p.h>
#include <private/qlayoutengine_p.h> // qSmartMin functions... #include <private/qlayoutengine_p.h> // qSmartMin functions...

1
tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
View File

@ -46,6 +46,7 @@
#endif #endif
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <private/qgraphicsscene_p.h> #include <private/qgraphicsscene_p.h>
#include <private/qgraphicssceneindex_p.h> #include <private/qgraphicssceneindex_p.h>
#include <math.h> #include <math.h>

3
tests/auto/qgridlayout/tst_qgridlayout.cpp
View File

@ -48,6 +48,9 @@
#include <qsizepolicy.h> #include <qsizepolicy.h>
//#include <QtGui> //#include <QtGui>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QRadioButton>
#include <QtWidgets/QWindowsStyle> #include <QtWidgets/QWindowsStyle>
#include <QStyleFactory> #include <QStyleFactory>

1
tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
View File

@ -45,6 +45,7 @@
#include <QtCore> #include <QtCore>
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include "dynamictreemodel.h" #include "dynamictreemodel.h"
#include "qidentityproxymodel.h" #include "qidentityproxymodel.h"

1
tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
View File

@ -39,6 +39,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#include <QtTest/QtTest> #include <QtTest/QtTest>
class tst_QItemEditorFactory: public QObject class tst_QItemEditorFactory: public QObject

1
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
View File

@ -43,6 +43,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
//TESTED_CLASS= //TESTED_CLASS=
//TESTED_FILES= //TESTED_FILES=

1
tests/auto/qitemview/viewstotest.cpp
View File

@ -43,6 +43,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
/* /*
To add a view to be tested add the header file to the includes To add a view to be tested add the header file to the includes

1
tests/auto/qlistwidget/tst_qlistwidget.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#include <qeventloop.h> #include <qeventloop.h>
#include <qlist.h> #include <qlist.h>

1
tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <QtCore> #include <QtCore>
#include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkRequest>

4
tests/auto/qopengl/tst_qopengl.cpp
View File

@ -41,6 +41,10 @@
#include <QtGui/private/qopenglcontext_p.h> #include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QOpenGLFramebufferObject>
#include <QtGui/QOpenGLPaintDevice>
#include <QtGui/QPainter>
#include <QtGui/QScreen>
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <QtTest/QtTest> #include <QtTest/QtTest>

1
tests/auto/qscroller/tst_qscroller.cpp
View File

@ -40,6 +40,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <QtTest> #include <QtTest>
// #include <QDebug> // #include <QDebug>

2
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
View File

@ -48,7 +48,7 @@
#include <QtCore> #include <QtCore>
#include <QtGui> #include <QtGui>
#include <QtWidgets/QSortFilterProxyModel> #include <QtWidgets>
#include <qdebug.h> #include <qdebug.h>

1
tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
View File

@ -40,6 +40,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore> #include <QtCore>
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtDebug> #include <QtDebug>
#include <QMetaObject> #include <QMetaObject>

1
tests/auto/qtableview/tst_qtableview.cpp
View File

@ -41,6 +41,7 @@
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#include <private/qtablewidget_p.h> #include <private/qtablewidget_p.h>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include "../../shared/util.h" #include "../../shared/util.h"

1
tests/auto/qtreeview/tst_qtreeview.cpp
View File

@ -45,6 +45,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#include "../../shared/util.h" #include "../../shared/util.h"
//TESTED_CLASS= //TESTED_CLASS=

2
tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
View File

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qsqldatabase.cpp SOURCES += tst_qsqldatabase.cpp
QT += sql QT = core sql
win32: { win32: {
!wince*: LIBS += -lws2_32 !wince*: LIBS += -lws2_32

2
tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
View File

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qsqldriver.cpp SOURCES += tst_qsqldriver.cpp
QT += sql QT = core sql
wince*: { wince*: {
plugFiles.files = ../../../plugins/sqldrivers plugFiles.files = ../../../plugins/sqldrivers

2
tests/auto/sql/kernel/qsqlfield/qsqlfield.pro
View File

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qsqlfield.cpp SOURCES += tst_qsqlfield.cpp
QT += sql QT = core sql
symbian { symbian {
qt_not_deployed { qt_not_deployed {

2
tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro
View File

@ -14,7 +14,7 @@ symbian {
TARGET.EPOCHEAPSIZE=50000 5000000 TARGET.EPOCHEAPSIZE=50000 5000000
} }
QT += sql QT = core sql

1
tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <qsqldriver.h> #include <qsqldriver.h>
#include <qsqldatabase.h> #include <qsqldatabase.h>

2
tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
View File

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qsqlrelationaltablemodel.cpp SOURCES += tst_qsqlrelationaltablemodel.cpp
QT += sql QT = core sql
wince*: { wince*: {
plugFiles.files = ../../../plugins/sqldrivers plugFiles.files = ../../../plugins/sqldrivers

2
tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
View File

@ -1,7 +1,7 @@
load(qttest_p4) load(qttest_p4)
SOURCES += tst_qsqltablemodel.cpp SOURCES += tst_qsqltablemodel.cpp
QT += sql QT = core sql
wince*: { wince*: {
plugFiles.files = ../../../plugins/sqldrivers plugFiles.files = ../../../plugins/sqldrivers

2
tests/auto/testlib/selftests/test/test.pro
View File

@ -1,6 +1,6 @@
load(qttest_p4) load(qttest_p4)
SOURCES += ../tst_selftests.cpp SOURCES += ../tst_selftests.cpp
QT += core xml testlib-private QT = core xml testlib-private
TARGET = ../tst_selftests TARGET = ../tst_selftests

1
tests/auto/testlib/selftests/xunit/xunit.pro
View File

@ -1,4 +1,5 @@
load(qttest_p4) load(qttest_p4)
QT = core
# this is not a real testcase ('make check' should not run it) # this is not a real testcase ('make check' should not run it)
CONFIG -= testcase CONFIG -= testcase

1
tests/auto/tools/moc/moc.pro
View File

@ -20,6 +20,7 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n
if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h
SOURCES += tst_moc.cpp SOURCES += tst_moc.cpp
QT -= gui
QT += sql network QT += sql network
contains(QT_CONFIG, dbus){ contains(QT_CONFIG, dbus){
DEFINES += WITH_DBUS DEFINES += WITH_DBUS

1
tests/auto/tools/rcc/rcc.pro
View File

@ -1,5 +1,6 @@
CONFIG += qttest_p4 CONFIG += qttest_p4
QT = core
TARGET = tst_rcc TARGET = tst_rcc
SOURCES += tst_rcc.cpp SOURCES += tst_rcc.cpp

1
tests/auto/tools/uic/uic.pro
View File

@ -1,5 +1,6 @@
load(qttest_p4) load(qttest_p4)
QT = core
SOURCES += tst_uic.cpp SOURCES += tst_uic.cpp
TARGET = tst_uic TARGET = tst_uic

2
tests/auto/v8/v8.pro
View File

@ -6,4 +6,4 @@ HEADERS += v8test.h
CONFIG += parallel_test CONFIG += parallel_test
QT += v8-private QT = core v8-private