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

Fix last few 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).

Change-Id: Ifd15f72e2c553fba0c399c921957c4e955bb590d
Reviewed-on: http://codereview.qt-project.org/5191
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Kent Hansen 2011-09-20 08:00:59 +02:00 committed by Qt by Nokia
parent dbdfdb2c95
commit fc1cde4eb4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro
View File

@ -4,6 +4,7 @@ load(qttest_p4)
CONFIG -= testcase
TEMPLATE = app
QT += widgets
TARGET = tst_bench_qmetaobject
SOURCES += main.cpp

1
tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro
View File

@ -4,6 +4,7 @@ load(qttest_p4)
CONFIG -= testcase
TEMPLATE = app
QT += widgets
TARGET = tst_bench_qstylesheetstyle
DEPENDPATH += .
INCLUDEPATH += .

8
tests/benchmarks/gui/text/qfontmetrics/main.cpp
View File

@ -71,7 +71,7 @@ void tst_QFontMetrics::testQFontMetrics( const QFontMetrics &fm )
void tst_QFontMetrics::fontmetrics_create()
{
QBENCHMARK {
QFont boldfont = QApplication::font();
QFont boldfont = QGuiApplication::font();
boldfont.setBold( true );
boldfont.setPointSize(boldfont.pointSize() * 1.5 );
QFontMetrics bfm( boldfont );
@ -81,7 +81,7 @@ void tst_QFontMetrics::fontmetrics_create()
void tst_QFontMetrics::fontmetrics_create_once_loaded()
{
QBENCHMARK {
QFont boldfont = QApplication::font();
QFont boldfont = QGuiApplication::font();
boldfont.setBold( true );
boldfont.setPointSize(boldfont.pointSize() * 1.5 );
QFontMetrics bfm( boldfont );
@ -90,7 +90,7 @@ void tst_QFontMetrics::fontmetrics_create_once_loaded()
void tst_QFontMetrics::fontmetrics_height()
{
QFont boldfont = QApplication::font();
QFont boldfont = QGuiApplication::font();
boldfont.setBold( true );
boldfont.setPointSize(boldfont.pointSize() * 1.5 );
QFontMetrics bfm( boldfont );
@ -100,7 +100,7 @@ void tst_QFontMetrics::fontmetrics_height()
void tst_QFontMetrics::fontmetrics_height_once_loaded()
{
QFont boldfont = QApplication::font();
QFont boldfont = QGuiApplication::font();
boldfont.setBold( true );
boldfont.setPointSize(boldfont.pointSize() * 1.5 );
QFontMetrics bfm( boldfont );