diff options
Diffstat (limited to 'tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp')
-rw-r--r-- | tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp index 61efb6e3f3..971f60bb3e 100644 --- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp @@ -580,8 +580,8 @@ void tst_QShortcut::text_data() Qt::UNICODE_ACCEL + Qt::Key_K */ /* see comments above on the #ifdef'ery */ - QTest::newRow("T06 - slot1") << SetupAccel << TriggerSlot1 << QString("\x0C5")<< 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; - QTest::newRow("T07 - slot2") << SetupAccel << TriggerSlot2 << QString("Shift+\x0C5")<< 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; + QTest::newRow("T06 - slot1") << SetupAccel << TriggerSlot1 << QString::fromLatin1("\x0C5")<< 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; + QTest::newRow("T07 - slot2") << SetupAccel << TriggerSlot2 << QString::fromLatin1("Shift+\x0C5")<< 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; QTest::newRow("T08 - slot2") << SetupAccel << TriggerSlot1 << QString("K") << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << NoResult; QTest::newRow("T:Qt::Key_aring") << TestAccel << NoWidget << QString("") << int(Qt::Key_Aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << Slot1Triggered; QTest::newRow("T:Qt::Key_Aring") << TestAccel << NoWidget << QString("") << int(Qt::SHIFT+Qt::Key_Aring) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << Slot2Triggered; @@ -1204,25 +1204,25 @@ void tst_QShortcut::sendKeyEvents(QWidget *w, int k1, QChar c1, int k2, QChar c2 k4 &= ~Qt::MODIFIER_MASK; - if (k1 || c1.toAscii()) { + if (k1 || c1.toLatin1()) { QString c(c1.unicode() == QChar::Null ? QString() : QString(c1)); QTest::sendKeyEvent(QTest::Press, w, static_cast<Qt::Key>(k1), c, b1); QTest::sendKeyEvent(QTest::Release, w, static_cast<Qt::Key>(k1), c, b1); } - if (k2 || c2.toAscii()) { + if (k2 || c2.toLatin1()) { QString c(c2.unicode() == QChar::Null ? QString() : QString(c2)); QTest::sendKeyEvent(QTest::Press, w, static_cast<Qt::Key>(k2), c, b2); QTest::sendKeyEvent(QTest::Release, w, static_cast<Qt::Key>(k2), c, b2); } - if (k3 || c3.toAscii()) { + if (k3 || c3.toLatin1()) { QString c(c3.unicode() == QChar::Null ? QString() : QString(c3)); QTest::sendKeyEvent(QTest::Press, w, static_cast<Qt::Key>(k3), c, b3); QTest::sendKeyEvent(QTest::Release, w, static_cast<Qt::Key>(k3), c, b3); } - if (k4 || c4.toAscii()) { + if (k4 || c4.toLatin1()) { QString c(c4.unicode() == QChar::Null ? QString() : QString(c4)); QTest::sendKeyEvent(QTest::Press, w, static_cast<Qt::Key>(k4), c, b4); QTest::sendKeyEvent(QTest::Release, w, static_cast<Qt::Key>(k4), c, b4); |