1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing #else for a zero entry in an index mapping

Browse Source 
Follow-up to commit dff3843d98d52e2c32fea07371f91117de0667e9.
Noticed during branch-merge conflict resolution.

Change-Id: I9a0ed11853c00f0d260d2fbd5f909ea2a65fd346
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2020-01-28 11:16:02 +01:00
parent c08a31634f
commit 6251963ecd
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qvariant.cpp
View File

@ -2471,6 +2471,8 @@ static const ushort mapIdFromQt3ToCurrent[MapFromThreeCount] =
QMetaType::QBitArray, QMetaType::QBitArray,
#if QT_CONFIG(shortcut) #if QT_CONFIG(shortcut)
QMetaType::QKeySequence, QMetaType::QKeySequence,
#else
0, // QKeySequence
#endif #endif
QMetaType::QPen, QMetaType::QPen,
QMetaType::LongLong, QMetaType::LongLong,