AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make qfont autotest build without widgets

Browse Source 
Change-Id: I2ab344d44cb2aa8c59c1c28f7368784849d4b74d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Kent Hansen 2012-06-05 14:00:47 +02:00 committed by Qt by Nokia
parent 027cd4c1b9
commit 5fc8cc830e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/gui/text/qfont/qfont.pro
View File

@ -1,7 +1,8 @@
CONFIG += testcase
CONFIG += parallel_test
TARGET = tst_qfont
QT += widgets testlib
QT += testlib
!contains(QT_CONFIG, no-widgets): QT += widgets
SOURCES += tst_qfont.cpp

12
tests/auto/gui/text/qfont/tst_qfont.cpp
View File

@ -47,8 +47,10 @@
#include <qfontdatabase.h>
#include <qfontinfo.h>
#include <qstringlist.h>
#include <qapplication.h>
#include <qguiapplication.h>
#ifndef QT_NO_WIDGETS
#include <qwidget.h>
#endif
#include <qlist.h>
class tst_QFont : public QObject
@ -67,7 +69,9 @@ private slots:
void exactMatch();
void compare();
void resolve();
#ifndef QT_NO_WIDGETS
void resetFont();
#endif
void isCopyOf();
void setFontRaw();
void italicOblique();
@ -468,6 +472,7 @@ void tst_QFont::resolve()
QCOMPARE(f4.pointSize(), 55);
}
#ifndef QT_NO_WIDGETS
void tst_QFont::resetFont()
{
QWidget parent;
@ -491,14 +496,15 @@ void tst_QFont::resetFont()
QVERIFY(child->font().pointSize() == parent.font().pointSize());
QVERIFY(parent.font().resolve() != 0);
}
#endif
void tst_QFont::isCopyOf()
{
QFont font;
QVERIFY(font.isCopyOf(QApplication::font()));
QVERIFY(font.isCopyOf(QGuiApplication::font()));
QFont font2("bogusfont", 23);
QVERIFY(! font2.isCopyOf(QApplication::font()));
QVERIFY(! font2.isCopyOf(QGuiApplication::font()));
QFont font3 = font;
QVERIFY(font3.isCopyOf(font));