From 16e546e32fec393bc3b126f280114bcbfa7151ff Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 21 Jul 2020 12:16:09 +0200 Subject: Properly deprecate Qt::MidButton in favor of Qt::MiddleButton MidButton had its // ### Qt 5: remove me upgraded to Qt 6 at 5.0; but it dates back to 4.7.0 Replace the many remaining uses of MidButton with MiddleButton in the process. Pick-to: 5.15 Change-Id: Idc1b1b1816673dfdb344d703d101febc823a76ff Reviewed-by: Lars Knoll --- tests/auto/corelib/global/qflags/tst_qflags.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/corelib/global/qflags/tst_qflags.cpp') diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp index e0cc1d71f5..64afdaf352 100644 --- a/tests/auto/corelib/global/qflags/tst_qflags.cpp +++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp @@ -49,7 +49,7 @@ void tst_QFlags::testFlag() const Qt::MouseButtons btn = Qt::LeftButton | Qt::RightButton; QVERIFY(btn.testFlag(Qt::LeftButton)); - QVERIFY(!btn.testFlag(Qt::MidButton)); + QVERIFY(!btn.testFlag(Qt::MiddleButton)); btn = { }; QVERIFY(!btn.testFlag(Qt::LeftButton)); @@ -276,11 +276,11 @@ void tst_QFlags::testSetFlags() btn.setFlag(Qt::LeftButton); QVERIFY(btn.testFlag(Qt::LeftButton)); - QVERIFY(!btn.testFlag(Qt::MidButton)); + QVERIFY(!btn.testFlag(Qt::MiddleButton)); btn.setFlag(Qt::LeftButton, false); QVERIFY(!btn.testFlag(Qt::LeftButton)); - QVERIFY(!btn.testFlag(Qt::MidButton)); + QVERIFY(!btn.testFlag(Qt::MiddleButton)); MyStrictFlags flags; flags.setFlag(MyStrictEnum::StrictOne); -- cgit v1.2.3