ca35995c1b
(Currently, the Qt5 windows packages lack the tiff and mng plugins
from qtimageformats because of this issue.)
If Qt is configured to use its bundled zlib, it is compiled into
QtCore, and the public symbols are exported so that it can be used
by other Qt libraries. However, after modularization, this did not
work for libraries outside qtbase, since they did not have access
to the headers of the bundled zlib.
This commit fixes that.
Ref. also 1f461ac45b
Change-Id: Ie986f47e00fd0c16f2ba04d27f4258a20d61b260
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
91 lines
4.2 KiB
Plaintext
91 lines
4.2 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",
|
|
"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
|
|
);
|
|
@allmoduleheadersprivate = (
|
|
);
|
|
%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",
|
|
"qnumeric.h" => "QtNumeric",
|
|
"qsql.h" => "QSql",
|
|
"qssl.h" => "QSsl",
|
|
"qtest.h" => "QTest",
|
|
"qtconcurrentmap.h" => "QtConcurrentMap",
|
|
"qtconcurrentfilter.h" => "QtConcurrentFilter",
|
|
"qtconcurrentrun.h" => "QtConcurrentRun",
|
|
);
|
|
%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" => {
|
|
"QVariantHash" => "qvariant.h",
|
|
"QVariantList" => "qvariant.h",
|
|
"QVariantMap" => "qvariant.h",
|
|
}
|
|
);
|
|
|
|
@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" );
|
|
@ignore_headers = ( @internal_zlib_headers );
|
|
@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers, @angle_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);
|
|
@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);
|
|
@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" );
|
|
%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:
|
|
# - A specific Git revision.
|
|
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
|
|
#
|
|
%dependencies = (
|
|
);
|