diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-11-11 13:03:15 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-14 18:41:17 +0100 |
| commit | beaf6b16a942904c368da9dad98d3e44136e6928 (patch) | |
| tree | e6c52f12b9803d13b743e77b56d8e0f4967aacea /sync.profile | |
| parent | a85375c57f5c913fc2fd86309d840bfecd2bcc21 (diff) | |
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 <oswald.buddenhagen@nokia.com>
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 7 |
1 files changed, 7 insertions, 0 deletions
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" ); |