diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-20 08:00:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-20 19:18:19 +0200 |
| commit | fc1cde4eb437e579ff194af4545973fbe23ffbba (patch) | |
| tree | 1c634c5e1f18c9e8317260c74e1a96efe03c3a7b /tests/benchmarks/gui | |
| parent | dbdfdb2c95b261fe28955a89c2e00e212fd7d106 (diff) | |
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 <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>
Diffstat (limited to 'tests/benchmarks/gui')
| -rw-r--r-- | tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro | 1 | ||||
| -rw-r--r-- | tests/benchmarks/gui/text/qfontmetrics/main.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
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 ); |