diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2017-05-23 14:47:14 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-01-08 07:18:01 +0000 |
| commit | b4869b8e9324c1614333066a6cc5d0df0d7b6af9 (patch) | |
| tree | 42ae7320d8e20fe8fcf8aa8e0de826e4ef6878af /tests/auto/other | |
| parent | b096c53d593a313a6372bffb35f45cdc0e1ffd21 (diff) | |
Cocoa: Make AA_MacDontSwapCtrlMeta work
Task-number: QTBUG-22775
Task-number: QTBUG-51293
Change-Id: If615426001a1ea482f854f49cbae33ca1c954e9a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/macnativeevents/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/other/macnativeevents/tst_macnativeevents.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/other/macnativeevents/BLACKLIST b/tests/auto/other/macnativeevents/BLACKLIST index 1bc530ecc8..32e0b1d50b 100644 --- a/tests/auto/other/macnativeevents/BLACKLIST +++ b/tests/auto/other/macnativeevents/BLACKLIST @@ -7,8 +7,6 @@ osx osx [testChildWindowInFrontOfStaysOnTopParentWindow] osx -[testModifierCtrlWithDontSwapCtrlAndMeta] -osx [testMouseMoveLocation] osx [testMouseLeftDoubleClick] diff --git a/tests/auto/other/macnativeevents/tst_macnativeevents.cpp b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp index e8970e6f24..18585d1856 100644 --- a/tests/auto/other/macnativeevents/tst_macnativeevents.cpp +++ b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp @@ -501,10 +501,10 @@ void tst_MacNativeEvents::testModifierCtrlWithDontSwapCtrlAndMeta() native.append(new QNativeModifierEvent(Qt::NoModifier)); ExpectedEventList expected(&w); - expected.append(new QKeyEvent(QEvent::KeyPress, Qt::Key_Meta, Qt::NoModifier)); + expected.append(new QKeyEvent(QEvent::KeyPress, Qt::Key_Control, Qt::NoModifier)); expected.append(new QKeyEvent(QEvent::KeyPress, Qt::Key_A, Qt::ControlModifier)); expected.append(new QKeyEvent(QEvent::KeyRelease, Qt::Key_A, Qt::ControlModifier)); - expected.append(new QKeyEvent(QEvent::KeyRelease, Qt::Key_Meta, Qt::ControlModifier)); + expected.append(new QKeyEvent(QEvent::KeyRelease, Qt::Key_Control, Qt::ControlModifier)); native.play(); QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!"); |