diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-02-10 21:08:00 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-02-12 17:39:57 +0000 |
| commit | 383d2eaab47c6de0d63f0ae79fbc795f28e845d9 (patch) | |
| tree | e9c5e1b2c2e0dc64944de535089bb5d775fdb79e | |
| parent | c168838f7d38b3639c8e7453b9ba697c2b0c5229 (diff) | |
Fix autotest tst_QAction::setStandardKeys()
The possible key sequences for QKeySequence::Copy on X11 is Ctrl+C, then
Ctrl+Insert and at last F16. The order is defined in
QPlatformThemePrivate::keyBindings.
Task-number: QTBUG-46053
Change-Id: I86a0767e268088edfce98cfb07f9fb78f00d0713
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| -rw-r--r-- | tests/auto/widgets/kernel/qaction/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/kernel/qaction/tst_qaction.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/widgets/kernel/qaction/BLACKLIST b/tests/auto/widgets/kernel/qaction/BLACKLIST deleted file mode 100644 index 1ad524fdbf..0000000000 --- a/tests/auto/widgets/kernel/qaction/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[setStandardKeys] -linux diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp index 272ec6d60b..ddf9ccb416 100644 --- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp +++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp @@ -240,7 +240,7 @@ void tst_QAction::setStandardKeys() expected << ctrlC << ctrlInsert; break; default: // X11 - expected << ctrlC << QKeySequence(QStringLiteral("F16")) << ctrlInsert; + expected << ctrlC << ctrlInsert << QKeySequence(QStringLiteral("F16")); break; } |