Fix source incompatibility for QVariant{Map, Hash, List}
Change 7f35d5849e
(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 <oswald.buddenhagen@nokia.com>
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
This commit is contained in:
parent
a85375c57f
commit
beaf6b16a9
@ -67,6 +67,13 @@
|
|||||||
"QtXml" => "$basedir/src/modules/qt_xml.pri",
|
"QtXml" => "$basedir/src/modules/qt_xml.pri",
|
||||||
"QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.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_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
|
||||||
@ignore_for_include_check = ( "qatomic.h" );
|
@ignore_for_include_check = ( "qatomic.h" );
|
||||||
|
Loading…
Reference in New Issue
Block a user