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/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.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/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp')
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 61ac6bb693..04976f4a8c 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -45,9 +45,6 @@ #include <QtWidgets> #include <private/qgraphicsproxywidget_p.h> #include <private/qlayoutengine_p.h> // qSmartMin functions... -#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) -#include <QMacStyle> -#endif #include "../../../qtest-config.h" @@ -2721,7 +2718,7 @@ void tst_QGraphicsProxyWidget::childPos() #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) // The Mac style wants the popup to show up at QPoint(4 - 11, 1). // See QMacStyle::subControlRect SC_ComboBoxListBoxPopup. - if (qobject_cast<QMacStyle *>(QApplication::style())) + if (QApplication::style()->inherits("QMacStyle")) expectedXPosition = qreal(4 - 11); #endif QCOMPARE(proxyChild->pos().x(), expectedXPosition); |