From 35a125971cd09318f59918dba9255c8a0ad9a97c Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Sat, 16 May 2015 12:21:22 +0200
Subject: Fix QtPrivate::IsQEnumHelper<void>

Change-Id: I1633ef128212a6b99b66129f13e0b4d5ea46644d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qmetatype.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 1e2a860d8c..b854dc16fd 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -1381,6 +1381,7 @@ QT_WARNING_DISABLE_CLANG("-Wlocal-type-template-args")
         // qt_getEnumMetaObject(T) which returns 'char'
         enum { Value = sizeof(qt_getEnumMetaObject(declval())) == sizeof(QMetaObject*) };
     };
+    template<> struct IsQEnumHelper<void> { enum { Value = false }; };
 QT_WARNING_POP
 
     template<typename T, typename Enable = void>
-- 
cgit v1.2.3


From 75af24a2d121ab56c5b60524bf1d7f2af1613025 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Sat, 23 May 2015 14:04:09 +0200
Subject: QMetaType: Do not automatically register types that derives from a
 Q_GADGET

Otherwise the type is registered with the wrong name

Change-Id: I68ec3a05e2528816626e648b46ccc9d70b004866
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/corelib/kernel/qmetatype.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index b854dc16fd..9ad8702e79 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -1357,12 +1357,16 @@ namespace QtPrivate
         enum { Value = sizeof(checkType(static_cast<T*>(0))) == sizeof(yes_type) };
     };
 
+    template<typename T, typename Enable = void>
+    struct IsGadgetHelper { enum { Value = false }; };
+
     template<typename T>
-    struct IsGadgetHelper
+    struct IsGadgetHelper<T, typename T::QtGadgetHelper>
     {
-        template<typename X> static typename X::QtGadgetHelper *checkType(X*);
-        static char checkType(void*);
-        enum { Value = sizeof(checkType(static_cast<T*>(0))) == sizeof(void*)  };
+        template <typename X>
+        static char checkType(void (X::*)());
+        static void *checkType(void (T::*)());
+        enum { Value =  sizeof(checkType(&T::qt_check_for_QGADGET_macro)) == sizeof(void *) };
     };
 
 
-- 
cgit v1.2.3


From 02f6b21bbc4f1f7afc30a87227c3a0787a5d2225 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Thu, 23 Apr 2015 12:02:40 +0200
Subject: QMetaType: Fix compilation with non default constructible Q_GADGET

Do not try to automatically register the meta type for Q_GADGET that
are not default constructible.
This fixes a source incompatibility in the function pointer syntax
of QObject::connect when such types are used as an argument of a signal.

Task-number: QTBUG-45721
Change-Id: I3065f6d57bc1f37e16988d2dee99118de250ca56
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qmetatype.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 9ad8702e79..1b214e9f74 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -1773,7 +1773,7 @@ template <typename T>
 struct QMetaTypeIdQObject<T, QMetaType::IsGadget>
 {
     enum {
-        Defined = 1
+        Defined = QtPrivate::is_default_constructible<T>::value
     };
 
     static int qt_metatype_id()
-- 
cgit v1.2.3