diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 13:08:26 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-28 18:22:50 +0200 |
| commit | 1070dbf3e5aaf782cb369a74758b156bffd0a849 (patch) | |
| tree | 3ea0fce78c253ed7c7d9b10b21fe2ba9122abb7f /tests | |
| parent | a3e359fb73262fd2b1bad55d9fc7a975f4eb1015 (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.
Change-Id: I6ea3839767e5f5158b0fed508f65798470191908
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 7883bf730405b20594dd1385b8e817160a5895f2)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp | 1 |
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 a78ebdb2b9..1f9320a4d1 100644 --- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp +++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp @@ -200,7 +200,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); |