From f9db44ad15aefa65c40a763c31dbf1313c59d455 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 24 Jul 2012 12:34:33 +0200 Subject: [PATCH] Make sure that unknown types use the handler for unknown types. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes an assert in the QVariant checkDataStream unit test when it no longer links to QtGui. Change-Id: Ib45139cf790f3ac6ee80e1c59f50d08d0b51ffa4 Reviewed-by: Olivier Goffart Reviewed-by: Jędrzej Nowacki --- src/corelib/kernel/qmetatype_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index 126acde8fa..a2e6839f43 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; }