Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix regression since be9e8cd953 [ci reset]

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-11-22 10:20:00 +02:00
parent 049e8b3a20
commit 7179a3886b
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/global/qnamespace.h
View file

@ -261,7 +261,8 @@ public:
Key_Backslash = 0x005c, Key_Backslash = 0x005c,
Key_BracketRight = 0x005d, Key_BracketRight = 0x005d,
Key_AsciiCircum = 0x005e, Key_AsciiCircum = 0x005e,
Key_Underscore = 0x0060, Key_Underscore = 0x005f,
Key_Grave = 0x0060,
Key_BraceLeft = 0x007b, Key_BraceLeft = 0x007b,
Key_Bar = 0x007c, Key_Bar = 0x007c,
Key_BraceRight = 0x007d, Key_BraceRight = 0x007d,
@ -589,7 +590,7 @@ public:
Key_ooblique = Key_oslash, Key_ooblique = Key_oslash,
Key_Ooblique = Key_Oslash, Key_Ooblique = Key_Oslash,
Key_Thorn = Key_THORN, Key_Thorn = Key_THORN,
Key_QuoteLeft = Key_Underscore, Key_QuoteLeft = Key_Grave,
Key_QuoteRight = Key_Apostrophe, Key_QuoteRight = Key_Apostrophe,
Key_Eth = Key_ETH, Key_Eth = Key_ETH,
Key_Henkan_Mode = Key_Henkan, Key_Henkan_Mode = Key_Henkan,

1
src/gui/kernel/qkeysequence.cpp
View file

@ -364,6 +364,7 @@ static const struct KeyNameTblData {
{ Qt::Key_BracketRight, QT_TRANSLATE_NOOP("QShortcut", "]") }, { Qt::Key_BracketRight, QT_TRANSLATE_NOOP("QShortcut", "]") },
{ Qt::Key_AsciiCircum, QT_TRANSLATE_NOOP("QShortcut", "^") }, { Qt::Key_AsciiCircum, QT_TRANSLATE_NOOP("QShortcut", "^") },
{ Qt::Key_Underscore, QT_TRANSLATE_NOOP("QShortcut", "_") }, { Qt::Key_Underscore, QT_TRANSLATE_NOOP("QShortcut", "_") },
{ Qt::Key_Grave, QT_TRANSLATE_NOOP("QShortcut", "`") },
{ Qt::Key_BraceLeft, QT_TRANSLATE_NOOP("QShortcut", "{") }, { Qt::Key_BraceLeft, QT_TRANSLATE_NOOP("QShortcut", "{") },
{ Qt::Key_Bar, QT_TRANSLATE_NOOP("QShortcut", "|") }, { Qt::Key_Bar, QT_TRANSLATE_NOOP("QShortcut", "|") },
{ Qt::Key_BraceRight, QT_TRANSLATE_NOOP("QShortcut", "}") }, { Qt::Key_BraceRight, QT_TRANSLATE_NOOP("QShortcut", "}") },

2
src/test/qasciikey.cpp
View file

@ -103,6 +103,7 @@ Qt::Key QTest::asciiToKey(char ascii)
case 0x5d: return Qt::Key_BracketRight; case 0x5d: return Qt::Key_BracketRight;
case 0x5e: return Qt::Key_AsciiCircum; case 0x5e: return Qt::Key_AsciiCircum;
case 0x5f: return Qt::Key_Underscore; case 0x5f: return Qt::Key_Underscore;
case 0x60: return Qt::Key_QuoteLeft;
case 0x61: return Qt::Key_A; case 0x61: return Qt::Key_A;
case 0x62: return Qt::Key_B; case 0x62: return Qt::Key_B;
case 0x63: return Qt::Key_C; case 0x63: return Qt::Key_C;
@ -288,6 +289,7 @@ char QTest::keyToAscii(Qt::Key key)
case Qt::Key_BracketRight: return 0x5d; case Qt::Key_BracketRight: return 0x5d;
case Qt::Key_AsciiCircum: return 0x5e; case Qt::Key_AsciiCircum: return 0x5e;
case Qt::Key_Underscore: return 0x5f; case Qt::Key_Underscore: return 0x5f;
case Qt::Key_QuoteLeft: return 0x60;
case Qt::Key_BraceLeft: return 0x7b; case Qt::Key_BraceLeft: return 0x7b;
case Qt::Key_Bar: return 0x7c; case Qt::Key_Bar: return 0x7c;

4
tests/auto/qinputdialog/tst_qinputdialog.cpp
View file

@ -27,7 +27,7 @@
#include <QLineEdit> #include <QLineEdit>
#include <QComboBox> #include <QComboBox>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <qinputdialog.h> #include <QInputDialog>
//TESTED_CLASS= //TESTED_CLASS=
//TESTED_FILES= //TESTED_FILES=
@ -77,7 +77,7 @@ QString normalizeNumericString(const QString &s)
void _keyClick(QWidget *widget, char key) void _keyClick(QWidget *widget, char key)
{ {
(widget, key); QTest::keyClick(widget, key);
} }
void _keyClick(QWidget *widget, Qt::Key key) void _keyClick(QWidget *widget, Qt::Key key)