From 6251963ecd26bfc480b2871e26b6df4d7ab88cee Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Tue, 28 Jan 2020 11:16:02 +0100
Subject: [PATCH] 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>
---
 src/corelib/kernel/qvariant.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 815eefc6173..26304fcc40f 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,