diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-28 11:16:02 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-30 18:15:14 +0100 |
| commit | 6251963ecd26bfc480b2871e26b6df4d7ab88cee (patch) | |
| tree | 3f53876d3e6b6a85157fb062f4302d4d72ebf71f | |
| parent | c08a31634fd8d25d14aed4a73a80f44f254163f3 (diff) | |
Add missing #else for a zero entry in an index mapping
Follow-up to commit dff3843d98d52e2c32fea07371f91117de0667e9.
Noticed during branch-merge conflict resolution.
Change-Id: I9a0ed11853c00f0d260d2fbd5f909ea2a65fd346
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 815eefc617..26304fcc40 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2471,6 +2471,8 @@ static const ushort mapIdFromQt3ToCurrent[MapFromThreeCount] = QMetaType::QBitArray, #if QT_CONFIG(shortcut) QMetaType::QKeySequence, +#else + 0, // QKeySequence #endif QMetaType::QPen, QMetaType::LongLong, |