diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
| commit | bc1cae774ad8cc084a98cb37d363770efbde025c (patch) | |
| tree | aeb16a5fa9093632eba6143fe53ef1dad3e383a4 /src/corelib/io/qsettings.cpp | |
| parent | 8d35ad8726f44c4e853b5a192203ffcbbd2476e1 (diff) | |
| parent | 26e876912435bdafbca2b425af43824d7ec5b876 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index fc7122d904..e485310e86 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -420,7 +420,10 @@ QString QSettingsPrivate::variantToString(const QVariant &v) case QVariant::UInt: case QVariant::Bool: case QVariant::Double: - case QVariant::KeySequence: { +#if QT_CONFIG(shortcut) + case QVariant::KeySequence: +#endif + { result = v.toString(); if (result.contains(QChar::Null)) result = QLatin1String("@String(") + result + QLatin1Char(')'); |