diff options
author | J-P Nurmi <jpnurmi@gmail.com> | 2012-11-17 00:52:26 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 15:18:15 +0100 |
commit | 27aa41cbba6c0bd76148fde63863cfbba0ec2456 (patch) | |
tree | d49ef13e32d9294c30c7e2017beee3ff71264c0c /tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | |
parent | d25572cc7b1dc414d2c0b1b575334f8152346a31 (diff) |
Made QMacStyle internal
We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.
=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QMacStyle directly.
Change-Id: I44a2f5ee3fe08ecc837b593a2a2737eb90e8c267
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 51a49f467d..5aa7b19917 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -60,7 +60,6 @@ #ifndef QT_NO_OPENGL #include <QtOpenGL> #endif -#include <QMacStyle> #include <QStyleHints> static const Qt::WindowFlags DefaultWindowFlags @@ -195,7 +194,7 @@ static bool verifyArrangement(QMdiArea *mdiArea, Arrangement arrangement, const int titleBarHeight = firstSubWindow->style()->pixelMetric(QStyle::PM_TitleBarHeight, &options); #ifdef Q_OS_MAC // ### Remove this after the mac style has been fixed - if (qobject_cast<QMacStyle *>(firstSubWindow->style())) + if (firstSubWindow->style()->inherits("QMacStyle")) titleBarHeight -= 4; #endif const QFontMetrics fontMetrics = QFontMetrics(QApplication::font("QMdiSubWindowTitleBar")); |