From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Tue, 24 Jul 2012 10:34:33 +0000 (+0200)
Subject: Make sure that unknown types use the handler for unknown types.
X-Git-Tag: v5.0.0-beta1~628
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9db44ad15aefa65c40a763c31dbf1313c59d455;p=profile%2Fivi%2Fqtbase.git

Make sure that unknown types use the handler for unknown types.

This fixes an assert in the QVariant checkDataStream unit test when
it no longer links to QtGui.

Change-Id: Ib45139cf790f3ac6ee80e1c59f50d08d0b51ffa4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
---

diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h
index 126acde..a2e6839 100644
--- a/src/corelib/kernel/qmetatype_p.h
+++ b/src/corelib/kernel/qmetatype_p.h
@@ -64,9 +64,9 @@ static inline int moduleForType(const uint typeId)
 {
     if (typeId <= QMetaType::LastCoreType)
         return Core;
-    if (typeId <= QMetaType::LastGuiType)
+    if (typeId >= QMetaType::FirstGuiType && typeId <= QMetaType::LastGuiType)
         return Gui;
-    if (typeId <= QMetaType::LastWidgetsType)
+    if (typeId >= QMetaType::FirstWidgetsType && typeId <= QMetaType::LastWidgetsType)
         return Widgets;
     return Unknown;
 }