diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-18 22:29:49 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-30 15:02:23 +0000 |
| commit | 9a51709ca6871a83afe58d26283eda63454b5214 (patch) | |
| tree | d62f501f33de1db4b7427c20a2a3dcc08e2cedd0 /src/widgets | |
| parent | 5be4e0ef1a3fdbd7462d5ceed15927012a01c07f (diff) | |
QMacStyle: Remove handling of defunct _q_styleObjectWindow property
It was supposed to be used in Qt Quick Controls 1, for the desktop
style, but the followup patches in QQC1 never landed, and QQC1 is
now deprecated.
Change-Id: Iceefd523fc02a9e48b986dc33bb13a41804dd199
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/styles/qstylehelper.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/styles/qstylehelper_p.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index 8679d96eda..0b910d46df 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -403,14 +403,6 @@ QColor backgroundColor(const QPalette &pal, const QWidget* widget) return pal.color(QPalette::Base); } -QWindow *styleObjectWindow(QObject *so) -{ - if (so) - return so->property("_q_styleObjectWindow").value<QWindow *>(); - - return 0; -} - WidgetSizePolicy widgetSizePolicy(const QWidget *widget, const QStyleOption *opt) { while (widget) { diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h index 260860bf4d..d79dfe4288 100644 --- a/src/widgets/styles/qstylehelper_p.h +++ b/src/widgets/styles/qstylehelper_p.h @@ -90,7 +90,6 @@ namespace QStyleHelper Q_WIDGETS_EXPORT bool hasAncestor(QObject *obj, QAccessible::Role role); #endif Q_WIDGETS_EXPORT QColor backgroundColor(const QPalette &pal, const QWidget* widget = 0); - Q_WIDGETS_EXPORT QWindow *styleObjectWindow(QObject *so); enum WidgetSizePolicy { SizeLarge = 0, SizeSmall = 1, SizeMini = 2, SizeDefault = -1 }; |