summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
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 /tests/auto/widgets
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 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index 899d090b5e..4a5702b709 100644
--- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
@@ -189,7 +189,6 @@ void tst_QMacStyle::sizeHints()
QDateTimeEdit dateTime1(&w);
QCOMPARE(sh(&dateTime1).height(), h1);
- ok1.setAttribute(Qt::WA_MacMetalStyle, true);
QSize s2 = sh(&ok1);
if (size == Normal) {
QVERIFY(s2.height() >= 21 && s2.height() <= 32);