"QtWidgets" => "$basedir/src/widgets",
"QtPrintSupport" => "$basedir/src/printsupport",
"QtOpenGL" => "$basedir/src/opengl",
- "QtCore" => "$basedir/src/corelib",
+ "QtCore" => "$basedir/src/corelib;^$basedir/src/3rdparty/harfbuzz/src",
"QtXml" => "$basedir/src/xml",
"QtSql" => "$basedir/src/sql",
"QtNetwork" => "$basedir/src/network",
"QtTest" => "$basedir/src/testlib",
"QtDBus" => "$basedir/src/dbus",
+ "QtConcurrent" => "$basedir/src/concurrent",
"QtPlatformSupport" => "$basedir/src/platformsupport",
+ "KHR" => "$basedir/src/3rdparty/angle/include/KHR",
+ "GLES2" => "$basedir/src/3rdparty/angle/include/GLES2",
+ "EGL" => "$basedir/src/3rdparty/angle/include/EGL",
+ "QtZlib" => "$basedir/src/3rdparty/zlib",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
);
"qdebug.h" => "QtDebug",
"qevent.h" => "QtEvents",
"qnamespace.h" => "Qt",
+ "qnumeric.h" => "QtNumeric",
+ "qsql.h" => "QSql",
"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",
- "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",
- "QtXml" => "$basedir/src/modules/qt_xml.pri",
- "QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri",
+%deprecatedheaders = (
+ "QtGui" => {
+ "QGenericPlugin" => "QtGui/QGenericPlugin",
+ "QGenericPluginFactory" => "QtGui/QGenericPluginFactory"
+ },
+ "QtWidgets" => {
+ "qplatformmenu_qpa.h" => "qpa/qplatformmenu.h",
+ "QPlatformMenu" => "qpa/qplatformmenu.h",
+ "QPlatformMenuAction" => "qpa/qplatformmenu.h",
+ "QPlatformMenuBar" => "qpa/qplatformmenu.h"
+ },
+ "QtPrintSupport" => {
+ "qplatformprintersupport_qpa.h" => "qpa/qplatformprintersupport.h",
+ "QPlatformPrinterSupport" => "qpa/qplatformprintersupport.h",
+ "QPlatformPrinterSupportPlugin" => "XXXXXXXXXXXXXXXXXXXX",
+ "qplatformprintplugin_qpa.h" => "qpa/qplatformprintplugin.h",
+ "QPlatformPrintPlugin" => "qpa/qplatformprintplugin.h"
+ },
+ "QtPlatformSupport" => {
+ "qplatforminputcontextfactory_qpa_p.h" => "qpa/qplatforminputcontextfactory_p.h",
+ "qplatforminputcontextplugin_qpa_p.h" => "qpa/qplatforminputcontextplugin_p.h",
+ "QPlatformInputContextPlugin" => "qpa/qplatforminputcontextplugin_p.h"
+ }
);
%explicitheaders = (
"QtCore" => {
}
);
-@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}" );
+@qpa_headers = ( qr/^qplatform/, qr/^qwindowsystem/ );
+my @angle_headers = ('egl.h', 'eglext.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h');
+my @internal_zlib_headers = ( "crc32.h", "deflate.h", "gzguts.h", "inffast.h", "inffixed.h", "inflate.h", "inftrees.h", "trees.h", "zutil.h" );
+my @zlib_headers = ( "zconf.h", "zlib.h" );
+my @harfbuzz_headers = ( "harfbuzz-buffer-private.h", "harfbuzz-buffer.h", "harfbuzz-dump.h", "harfbuzz-external.h", "harfbuzz-gdef-private.h", "harfbuzz-gdef.h", "harfbuzz-global.h", "harfbuzz-gpos-private.h", "harfbuzz-gpos.h", "harfbuzz-gsub-private.h", "harfbuzz-gsub.h", "harfbuzz-impl.h", "harfbuzz-open-private.h", "harfbuzz-open.h", "harfbuzz-shape.h", "harfbuzz-shaper-private.h", "harfbuzz-shaper.h", "harfbuzz-stream-private.h", "harfbuzz-stream.h", "harfbuzz.h" );
+@ignore_headers = ( @internal_zlib_headers );
+@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers, @angle_headers, @harfbuzz_headers);
+@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", @zlib_headers, @angle_headers, @harfbuzz_headers);
+@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", @zlib_headers, @angle_headers, @harfbuzz_headers);
+%inject_headers = ( "$basedir/src/corelib/global" => [ "qconfig.h" ] );
# 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: