diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 12:16:09 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-22 21:47:36 +0200 |
| commit | 16e546e32fec393bc3b126f280114bcbfa7151ff (patch) | |
| tree | 0d8d1f88fdd29ba5a28c3a5039bd7f6e6b76727c /tests/auto/corelib/global/qflags/tst_qflags.cpp | |
| parent | 4b1ffab8ad95eda737fde015c243442a28de8e23 (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/global/qflags/tst_qflags.cpp')
| -rw-r--r-- | tests/auto/corelib/global/qflags/tst_qflags.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |