whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up some auto tests of gui 

These unit tests do not depent on QtWidget.

Change-Id: I95526125c563885c0531da7ebfee06bca9a87b1c
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
bb10
Debao Zhang 2012-03-09 18:09:17 -08:00 committed by Qt by Nokia
parent eb57da5b3f
commit 57cf7c8a1b
10 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/gui/painting/qbrush/qbrush.pro
View File

@ -1,4 +1,4 @@
CONFIG += testcase
TARGET = tst_qbrush
QT += widgets testlib
QT += testlib
SOURCES += tst_qbrush.cpp

2
tests/auto/gui/painting/qpolygon/qpolygon.pro
View File

@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_qpolygon
QT += widgets testlib
QT += testlib
SOURCES += tst_qpolygon.cpp
unix:!mac:LIBS+=-lm

1
tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
View File

@ -47,7 +47,6 @@
#include <math.h>
#include <qpainter.h>
#include <qdialog.h>
class tst_QPolygon : public QObject
{

2
tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
View File

@ -4,7 +4,7 @@
CONFIG += testcase
TARGET = tst_qabstracttextdocumentlayout
QT += widgets testlib
QT += testlib
SOURCES += tst_qabstracttextdocumentlayout.cpp

2
tests/auto/gui/text/qstatictext/qstatictext.pro
View File

@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_qstatictext
QT += widgets widgets-private testlib
QT += testlib
QT += core core-private gui gui-private
SOURCES += tst_qstatictext.cpp

11
tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
View File

@ -40,7 +40,7 @@
****************************************************************************/
#include <QtTest/QtTest>
#include <QtWidgets/QApplication>
#include <QtGui/QGuiApplication>
#include <QtGui/QPainter>
#include <QtGui/QImage>
@ -48,7 +48,6 @@
#include <qpaintengine.h>
#include <private/qstatictext_p.h>
#include <private/qapplication_p.h>
// #define DEBUG_SAVE_IMAGE
@ -296,7 +295,7 @@ void tst_QStaticText::prepareToWrongData()
void tst_QStaticText::setFont()
{
QFont font = QApplication::font();
QFont font = QGuiApplication::font();
font.setBold(true);
font.setPointSize(28);
@ -618,7 +617,7 @@ void tst_QStaticText::plainTextVsRichText()
void tst_QStaticText::setPenPlainText()
{
QFont font = QApplication::font();
QFont font = QGuiApplication::font();
font.setStyleStrategy(QFont::NoAntialias);
QFontMetricsF fm(font);
@ -646,7 +645,7 @@ void tst_QStaticText::setPenPlainText()
void tst_QStaticText::setPenRichText()
{
QFont font = QApplication::font();
QFont font = QGuiApplication::font();
font.setStyleStrategy(QFont::NoAntialias);
QFontMetricsF fm(font);
@ -675,7 +674,7 @@ void tst_QStaticText::setPenRichText()
void tst_QStaticText::richTextOverridesPen()
{
QFont font = QApplication::font();
QFont font = QGuiApplication::font();
font.setStyleStrategy(QFont::NoAntialias);
QFontMetricsF fm(font);

2
tests/auto/gui/text/qtextblock/qtextblock.pro
View File

@ -1,7 +1,7 @@
CONFIG += testcase
TARGET = tst_qtextblock
QT += widgets widgets-private testlib
QT += testlib
QT += core-private gui-private
SOURCES += tst_qtextblock.cpp

2
tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
View File

@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = tst_qtextpiecetable
QT += widgets widgets-private testlib
QT += testlib
QT += core-private gui-private
SOURCES += tst_qtextpiecetable.cpp
HEADERS += ../qtextdocument/common.h

2
tests/auto/gui/util/qdesktopservices/qdesktopservices.pro
View File

@ -1,5 +1,5 @@
CONFIG += testcase
QT += widgets testlib
QT += testlib
SOURCES += tst_qdesktopservices.cpp
TARGET = tst_qdesktopservices

1
tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
View File

@ -41,7 +41,6 @@
#include <QtTest/QtTest>
#include <QStandardItemModel>
#include <qdebug.h>
#include <qdesktopservices.h>