From fc1cde4eb437e579ff194af4545973fbe23ffbba Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 20 Sep 2011 08:00:59 +0200 Subject: Fix last few autotest gui/widgets dependencies 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 Reviewed-by: Jo Asplin Reviewed-by: Matthew Cattell Reviewed-by: Lars Knoll --- tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro | 1 + tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro | 1 + tests/benchmarks/gui/text/qfontmetrics/main.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro index c266dca0e0..1c3cc0e51a 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro @@ -4,6 +4,7 @@ load(qttest_p4) CONFIG -= testcase TEMPLATE = app +QT += widgets TARGET = tst_bench_qmetaobject SOURCES += main.cpp diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro index d42d54d9ff..8a554e57f9 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro @@ -4,6 +4,7 @@ load(qttest_p4) CONFIG -= testcase TEMPLATE = app +QT += widgets TARGET = tst_bench_qstylesheetstyle DEPENDPATH += . INCLUDEPATH += . diff --git a/tests/benchmarks/gui/text/qfontmetrics/main.cpp b/tests/benchmarks/gui/text/qfontmetrics/main.cpp index 532b65533c..2bb32d737f 100644 --- a/tests/benchmarks/gui/text/qfontmetrics/main.cpp +++ b/tests/benchmarks/gui/text/qfontmetrics/main.cpp @@ -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 ); -- cgit v1.2.3