From beaf6b16a942904c368da9dad98d3e44136e6928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 11 Nov 2011 13:03:15 +0100 Subject: Fix source incompatibility for QVariant{Map, Hash, List} Change 7f35d5849e7233efac16c12271c58a049923b1c0 (Refactor QMetaType types.) introduced a source incompatibility by moving typedefs for QVariantHash, QVariantList and QVariantMap from qvariant.h file to qmetatype.h. The main issue here is that syncqt script is not able to distinguish between a forward declared typedef and definition of a typedef as they look same in source code. So generated header files for the typedefs were pointing wrongly to qmetatype.h which didn't have full definition of QVariant. Change-Id: I0268c666efd0f91d76af0ff91fb30525e3dd6223 Reviewed-by: Oswald Buddenhagen Reviewed-by: Kevin Simons --- sync.profile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sync.profile') diff --git a/sync.profile b/sync.profile index 7700a9fcc3..221086a554 100644 --- a/sync.profile +++ b/sync.profile @@ -67,6 +67,13 @@ "QtXml" => "$basedir/src/modules/qt_xml.pri", "QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri", ); +%explicitheaders = ( + "QtCore" => { + "QVariantHash" => "qvariant.h", + "QVariantList" => "qvariant.h", + "QVariantMap" => "qvariant.h", + } +); @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); @ignore_for_include_check = ( "qatomic.h" ); -- cgit v1.2.3