diff options
| author | Mate Barany <[email protected]> | 2022-09-15 16:08:08 +0200 |
|---|---|---|
| committer | Mate Barany <[email protected]> | 2022-09-21 14:00:37 +0200 |
| commit | ec19ced7317a41b6c8e0319c37e4f5fc44e0a1e8 (patch) | |
| tree | e27278067b2164140cea84c28dee0f47367c2a2b /src/gui/kernel/qkeysequence.cpp | |
| parent | 6f12603cb1ebf636852d972a304c0a6e752977df (diff) | |
QtGui: Fix mismatches between string types and string literals
This commit addresses some comments from the review of QTBUG-98434.
Some strings were initialized with incorrect literal types - fix the
mismatches between the string types and string literals.
Task-number: QTBUG-103100
Change-Id: I5f9f8a2c1583c21711f7b9ff177917f20690b5a3
Reviewed-by: Marc Mutz <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
Diffstat (limited to 'src/gui/kernel/qkeysequence.cpp')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index dc2054d19e9..1506ed16a73 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1074,20 +1074,20 @@ int QKeySequencePrivate::decodeString(QString accel, QKeySequence::SequenceForma *gmodifs << QModifKeyName(Qt::META, QChar(kControlUnicode)); *gmodifs << QModifKeyName(Qt::SHIFT, QChar(kShiftUnicode)); #endif - *gmodifs << QModifKeyName(Qt::CTRL, "ctrl+"_L1) - << QModifKeyName(Qt::SHIFT, "shift+"_L1) - << QModifKeyName(Qt::ALT, "alt+"_L1) - << QModifKeyName(Qt::META, "meta+"_L1) - << QModifKeyName(Qt::KeypadModifier, "num+"_L1); + *gmodifs << QModifKeyName(Qt::CTRL, u"ctrl+"_s) + << QModifKeyName(Qt::SHIFT, u"shift+"_s) + << QModifKeyName(Qt::ALT, u"alt+"_s) + << QModifKeyName(Qt::META, u"meta+"_s) + << QModifKeyName(Qt::KeypadModifier, u"num+"_s); } } else { gmodifs = globalPortableModifs(); if (gmodifs->isEmpty()) { - *gmodifs << QModifKeyName(Qt::CTRL, "ctrl+"_L1) - << QModifKeyName(Qt::SHIFT, "shift+"_L1) - << QModifKeyName(Qt::ALT, "alt+"_L1) - << QModifKeyName(Qt::META, "meta+"_L1) - << QModifKeyName(Qt::KeypadModifier, "num+"_L1); + *gmodifs << QModifKeyName(Qt::CTRL, u"ctrl+"_s) + << QModifKeyName(Qt::SHIFT, u"shift+"_s) + << QModifKeyName(Qt::ALT, u"alt+"_s) + << QModifKeyName(Qt::META, u"meta+"_s) + << QModifKeyName(Qt::KeypadModifier, u"num+"_s); } } |