File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -152,11 +152,12 @@ void KeyBinding::setSerialValue(const QString& aValue)
152
152
mKeyCode = key;
153
153
mSubKeyCode = subKey;
154
154
mModifiers = Qt::NoModifier;
155
+ // Values (0x01, 0x02, etc.) are short versions of the Qt modifier enums (Qt::<XXXModifier>)
155
156
if (mod & 0x01 ) mModifiers |= Qt::ControlModifier;
156
157
if (mod & 0x02 ) mModifiers |= Qt::ShiftModifier;
157
- if (mod & 0x04 ) mModifiers |= Qt::AltModifier;
158
- if (mod & 0x06 ) mModifiers |= Qt::KeypadModifier;
158
+ if (mod & 0x04 ) mModifiers |= Qt::AltModifier;
159
159
if (mod & 0x08 ) mModifiers |= Qt::MetaModifier;
160
+ if (mod & 0x20 ) mModifiers |= Qt::KeypadModifier;
160
161
161
162
if (!isValidBinding ())
162
163
{
@@ -168,12 +169,12 @@ void KeyBinding::setSerialValue(const QString& aValue)
168
169
169
170
QString KeyBinding::serialValue () const
170
171
{
171
- int mod = 0 ;
172
+ int mod = 0 ;
172
173
mod |= mModifiers .testFlag (Qt::ControlModifier) ? 0x01 : 0x00 ;
173
174
mod |= mModifiers .testFlag (Qt::ShiftModifier) ? 0x02 : 0x00 ;
174
175
mod |= mModifiers .testFlag (Qt::AltModifier) ? 0x04 : 0x00 ;
175
- mod |= mModifiers .testFlag (Qt::KeypadModifier) ? 0x06 : 0x00 ;
176
176
mod |= mModifiers .testFlag (Qt::MetaModifier) ? 0x08 : 0x00 ;
177
+ mod |= mModifiers .testFlag (Qt::KeypadModifier) ? 0x20 : 0x00 ;
177
178
return QString::number (mKeyCode ) + " ," + QString::number (mod) + " ," + QString::number (mSubKeyCode );
178
179
}
179
180
You can’t perform that action at this time.
0 commit comments