summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-20 13:08:26 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-08-27 13:05:42 +0000
commit7883bf730405b20594dd1385b8e817160a5895f2 (patch)
tree53f40e58dedb4d75cc0bdd833a57d23a77bfa914 /src/plugins
parentffde7e8995be207d3a3d628a31dbb19ba683a1c7 (diff)
Mark some Qt namespace enum members properly as deprecated
A comment is not good enough, Some of the enum members were even still in use, or mentioned in documentation. WA_ContentsPropagated, WA_WState_DND and WA_ForceAcceptDrops have been deprecated since 4.5.1; and at least the last has been an \omitvalue in the docs for even longer. (WA_ShowModal and WA_GroupLeader have been similarly marked, but are in use, see QTBUG-85816.) Push back to 5.15.1 in order to be able to remove these at Qt 6. Pick-to: 5.15.1 Change-Id: I6ea3839767e5f5158b0fed508f65798470191908 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/styles/windowsvista/qwindowsxpstyle.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index d8da357d6f..6183e32af2 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -1155,9 +1155,6 @@ void QWindowsXPStyle::polish(QWidget *widget)
widget->setWindowOpacity(0.6);
}
#endif
- if (qobject_cast<QStackedWidget*>(widget) &&
- qobject_cast<QTabWidget*>(widget->parent()))
- widget->parentWidget()->setAttribute(Qt::WA_ContentsPropagated);
Q_D(QWindowsXPStyle);
if (!d->hasInitColors) {