beaf6b16a9
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>
91 lines
3.8 KiB
Plaintext
91 lines
3.8 KiB
Plaintext
%modules = ( # path to module name map
|
|
"QtGui" => "$basedir/src/gui",
|
|
"QtWidgets" => "$basedir/src/widgets",
|
|
"QtPrintSupport" => "$basedir/src/printsupport",
|
|
"QtOpenGL" => "$basedir/src/opengl",
|
|
"QtCore" => "$basedir/src/corelib",
|
|
"QtV8" => "$basedir/src/v8",
|
|
"QtXml" => "$basedir/src/xml",
|
|
"QtSql" => "$basedir/src/sql",
|
|
"QtNetwork" => "$basedir/src/network",
|
|
"QtTest" => "$basedir/src/testlib",
|
|
"QtDBus" => "$basedir/src/dbus",
|
|
"QtPlatformSupport" => "$basedir/src/platformsupport",
|
|
);
|
|
%moduleheaders = ( # restrict the module headers to those found in relative path
|
|
"QtV8" => "../3rdparty/v8/include",
|
|
);
|
|
@allmoduleheadersprivate = (
|
|
"QtV8"
|
|
);
|
|
%classnames = (
|
|
"qglobal.h" => "QtGlobal",
|
|
"qendian.h" => "QtEndian",
|
|
"qconfig.h" => "QtConfig",
|
|
"qplugin.h" => "QtPlugin",
|
|
"qalgorithms.h" => "QtAlgorithms",
|
|
"qcontainerfwd.h" => "QtContainerFwd",
|
|
"qdebug.h" => "QtDebug",
|
|
"qevent.h" => "QtEvents",
|
|
"qnamespace.h" => "Qt",
|
|
"qssl.h" => "QSsl",
|
|
"qtest.h" => "QTest",
|
|
"qtconcurrentmap.h" => "QtConcurrentMap",
|
|
"qtconcurrentfilter.h" => "QtConcurrentFilter",
|
|
"qtconcurrentrun.h" => "QtConcurrentRun",
|
|
"qtcoreversion.h" => "QtCoreVersion",
|
|
"qtdbusversion.h" => "QtDBusVersion",
|
|
"qtguiversion.h" => "QtGuiVersion",
|
|
"qtnetworkversion.h" => "QtNetworkVersion",
|
|
"qtopenglversion.h" => "QtOpenGLVersion",
|
|
"qtopenvgversion.h" => "QtOpenVGVersion",
|
|
"qtsqlversion.h" => "QtSqlVersion",
|
|
"qttestversion.h" => "QtTestVersion",
|
|
"qtv8version.h" => "QtV8Version",
|
|
"qtxmlversion.h" => "QtXmlVersion",
|
|
);
|
|
%mastercontent = (
|
|
"core" => "#include <QtCore/QtCore>\n",
|
|
"gui" => "#include <QtGui/QtGui>\n",
|
|
"printsupport" => "#include <QtPrintSupport/QtPrintSupport>\n",
|
|
"widgets" => "#include <QtWidgets/QtWidgets>\n",
|
|
"network" => "#include <QtNetwork/QtNetwork>\n",
|
|
"opengl" => "#include <QtOpenGL/QtOpenGL>\n",
|
|
"xml" => "#include <QtXml/QtXml>\n",
|
|
);
|
|
%modulepris = (
|
|
"QtCore" => "$basedir/src/modules/qt_core.pri",
|
|
"QtDBus" => "$basedir/src/modules/qt_dbus.pri",
|
|
"QtGui" => "$basedir/src/modules/qt_gui.pri",
|
|
"QtPrintSupport" => "$basedir/src/modules/qt_printsupport.pri",
|
|
"QtWidgets" => "$basedir/src/modules/qt_widgets.pri",
|
|
"QtNetwork" => "$basedir/src/modules/qt_network.pri",
|
|
"QtOpenGL" => "$basedir/src/modules/qt_opengl.pri",
|
|
"QtSql" => "$basedir/src/modules/qt_sql.pri",
|
|
"QtTest" => "$basedir/src/modules/qt_testlib.pri",
|
|
"QtV8" => "$basedir/src/modules/qt_v8.pri",
|
|
"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" );
|
|
@ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
|
|
@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
|
|
@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" );
|
|
# Module dependencies.
|
|
# Every module that is required to build this module should have one entry.
|
|
# Each of the module version specifiers can take one of the following values:
|
|
# - A specific Git revision.
|
|
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
|
|
#
|
|
%dependencies = (
|
|
);
|