From f247e94b51a825b09c33ad09098622677801a3b8 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 19 Jun 2012 13:03:43 +0200
Subject: Enlarge QVariant's private to fit the new QString and QByteArray

Change-Id: I8baecd0a4db13200b34cdd7c8aebc2a1cc0a0c75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/corelib/kernel/qvariant.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/corelib/kernel/qvariant.h')

diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 21802aee85..0457b6fbad 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -396,7 +396,7 @@ class Q_CORE_EXPORT QVariant
     struct Private
     {
         inline Private() noexcept : type(Invalid), is_shared(false), is_null(true)
-        { data.ptr = nullptr; }
+        {}
 
         // Internal constructor for initialized variants.
         explicit inline Private(uint variantType) noexcept
@@ -412,6 +412,7 @@ class Q_CORE_EXPORT QVariant
 #endif
         union Data
         {
+            void *threeptr[3] = { nullptr, nullptr, nullptr };
             char c;
             uchar uc;
             short s;
-- 
cgit v1.2.3