diff options
author | Debao Zhang <dbzhang800@gmail.com> | 2012-03-20 20:21:30 -0700 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 13:22:10 +0100 |
commit | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (patch) | |
tree | ed358dc4de958dc7e52be1dc8282237c3f073969 /tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | |
parent | f31e614245e796c7f82ec33eed708902d4d01521 (diff) |
Remove QWorkspace.
QWorkspace had been called Q3Workspace before Qt4.0 finally released.
In a sense, it is a Qt3 support Widget. And QWorkspace has been
deprecated and replaced by QMdiArea at Qt4.3.
Change-Id: Iea1bf831c9960c23c2b21d51fdc7c13b303642ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index e97b044dbc..eeb2eea9a1 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -199,7 +199,7 @@ static bool verifyArrangement(QMdiArea *mdiArea, Arrangement arrangement, const if (qobject_cast<QMacStyle *>(firstSubWindow->style())) titleBarHeight -= 4; #endif - const QFontMetrics fontMetrics = QFontMetrics(QApplication::font("QWorkspaceTitleBar")); + const QFontMetrics fontMetrics = QFontMetrics(QApplication::font("QMdiSubWindowTitleBar")); const int dy = qMax(titleBarHeight - (titleBarHeight - fontMetrics.height()) / 2, 1); const int dx = 10; @@ -1823,7 +1823,7 @@ void tst_QMdiArea::cascadeAndTileSubWindows() // ### Remove this after the mac style has been fixed if (windows.at(1)->style()->inherits("QMacStyle")) titleBarHeight -= 4; - const QFontMetrics fontMetrics = QFontMetrics(QApplication::font("QWorkspaceTitleBar")); + const QFontMetrics fontMetrics = QFontMetrics(QApplication::font("QMdiSubWindowTitleBar")); const int dy = qMax(titleBarHeight - (titleBarHeight - fontMetrics.height()) / 2, 1); QCOMPARE(windows.at(2)->geometry().top() - windows.at(1)->geometry().top(), dy); |