2010-11-15 19:55:17 +00:00
|
|
|
%modules = ( # path to module name map
|
|
|
|
"QtGui" => "$basedir/src/gui",
|
2011-05-06 22:02:01 +00:00
|
|
|
"QtWidgets" => "$basedir/src/widgets",
|
2011-08-16 14:38:56 +00:00
|
|
|
"QtPrintSupport" => "$basedir/src/printsupport",
|
2010-11-15 19:55:17 +00:00
|
|
|
"QtOpenGL" => "$basedir/src/opengl",
|
2020-02-04 10:47:39 +00:00
|
|
|
"QtOpenGLWidgets" => "$basedir/src/openglwidgets",
|
2013-03-10 08:55:27 +00:00
|
|
|
"QtCore" => "$basedir/src/corelib",
|
2010-11-15 19:55:17 +00:00
|
|
|
"QtXml" => "$basedir/src/xml",
|
|
|
|
"QtSql" => "$basedir/src/sql",
|
|
|
|
"QtNetwork" => "$basedir/src/network",
|
|
|
|
"QtTest" => "$basedir/src/testlib",
|
|
|
|
"QtDBus" => "$basedir/src/dbus",
|
2012-02-03 13:17:26 +00:00
|
|
|
"QtConcurrent" => "$basedir/src/concurrent",
|
2016-10-12 09:55:52 +00:00
|
|
|
"QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery",
|
|
|
|
"QtInputSupport" => "$basedir/src/platformsupport/input",
|
|
|
|
"QtFbSupport" => "$basedir/src/platformsupport/fbconvenience",
|
2016-10-04 09:29:26 +00:00
|
|
|
"QtKmsSupport" => "$basedir/src/platformsupport/kmsconvenience",
|
2015-11-10 17:40:04 +00:00
|
|
|
"QtZlib" => "!>$basedir/src/corelib;$basedir/src/3rdparty/zlib",
|
2016-05-27 08:04:03 +00:00
|
|
|
"QtEglFSDeviceIntegration" => "$basedir/src/plugins/platforms/eglfs",
|
2020-07-09 08:26:01 +00:00
|
|
|
"QtEglFsKmsSupport" => "$basedir/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support",
|
|
|
|
"QtEglFsKmsGbmSupport" => "$basedir/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms",
|
2018-10-17 20:03:28 +00:00
|
|
|
"QtMockPlugins1" => "$basedir/tests/auto/cmake/mockplugins/mockplugins1",
|
|
|
|
"QtMockPlugins2" => "$basedir/tests/auto/cmake/mockplugins/mockplugins2",
|
|
|
|
"QtMockPlugins3" => "$basedir/tests/auto/cmake/mockplugins/mockplugins3",
|
2010-11-15 19:55:17 +00:00
|
|
|
);
|
|
|
|
%moduleheaders = ( # restrict the module headers to those found in relative path
|
2016-05-27 08:04:03 +00:00
|
|
|
"QtEglFSDeviceIntegration" => "api",
|
2011-08-16 08:50:00 +00:00
|
|
|
);
|
|
|
|
@allmoduleheadersprivate = (
|
2010-11-15 19:55:17 +00:00
|
|
|
);
|
|
|
|
%classnames = (
|
|
|
|
"qglobal.h" => "QtGlobal",
|
|
|
|
"qendian.h" => "QtEndian",
|
2014-02-03 21:22:14 +00:00
|
|
|
"qconfig.h" => "QtConfig",
|
2010-11-15 19:55:17 +00:00
|
|
|
"qplugin.h" => "QtPlugin",
|
|
|
|
"qalgorithms.h" => "QtAlgorithms",
|
2020-05-27 07:58:12 +00:00
|
|
|
"qvector.h" => "QVector",
|
2010-11-15 19:55:17 +00:00
|
|
|
"qcontainerfwd.h" => "QtContainerFwd",
|
|
|
|
"qdebug.h" => "QtDebug",
|
|
|
|
"qevent.h" => "QtEvents",
|
|
|
|
"qnamespace.h" => "Qt",
|
2012-07-06 14:56:59 +00:00
|
|
|
"qnumeric.h" => "QtNumeric",
|
2014-01-30 18:34:49 +00:00
|
|
|
"qvariant.h" => "QVariantHash,QVariantList,QVariantMap",
|
2017-01-31 14:04:33 +00:00
|
|
|
"qvulkanfunctions.h" => "QVulkanFunctions,QVulkanDeviceFunctions",
|
2014-07-18 12:35:36 +00:00
|
|
|
"qgl.h" => "QGL",
|
2017-02-17 09:17:10 +00:00
|
|
|
"qtsqlglobal.h" => "QSql",
|
2010-11-15 19:55:17 +00:00
|
|
|
"qssl.h" => "QSsl",
|
|
|
|
"qtest.h" => "QTest",
|
|
|
|
"qtconcurrentmap.h" => "QtConcurrentMap",
|
|
|
|
"qtconcurrentfilter.h" => "QtConcurrentFilter",
|
|
|
|
"qtconcurrentrun.h" => "QtConcurrentRun",
|
2019-12-12 09:33:34 +00:00
|
|
|
"qpassworddigestor.h" => "QPasswordDigestor",
|
2020-11-04 21:30:09 +00:00
|
|
|
"qutf8stringview.h" => "QUtf8StringView",
|
2010-11-15 19:55:17 +00:00
|
|
|
);
|
Expose QPA API under qpa/*
The main reasons for doing this are:
1. _qpa.h end up in the master QtGui include file. QtGui is meant for
userland applications. qpa code is neither binary nor source compatible.
Inadvertant use of QPA api makes the user code binary-incompatible.
2. syncqt creates forwarding headers for non-private header files. This
gives people the impression that this is public API.
As discussed on the mailing list, even though QPA api is internal and subject
to change, it needs to treated differently from private headers since they
will be used by in-qtbase and out-of-qtbase plugins.
This commit does the following:
1. The _qpa in QPA header files is dropped.
2. syncqt now treats any file with qplatform prefix as a special file and
moves it to qpa/ directory. The recommended way of using QPA API in plugins
is: #include <qpa/qplatformfoo.h>. This allows the user include QPA API
from multiple modules (for example, qplatformfoo might be in QtPrintSupport)
3. The user needs to explicitly add QT += <module>-private to get access to
the qpa api.
4. Creates compat headers for the olden style qplatformfoo_qpa.h and QPlatformFoo
includes.
This commit does not change the cpp filenames. This requires a more careful
merging of existing non qpa cpp files and existing cpp files on a case by
case basis. This can be done at anytime.
The following files are not renamed as part of this changed but will be fixed
as part of a future change:
src/gui/kernel/qgenericpluginfactory_qpa.h
src/gui/kernel/qgenericplugin_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa.h
files were renamed using
for x in `find . -name "qplatform*_qpa.h"`; do git mv $x "${x/_qpa.h/.h}"; done
for x in `find . -name "qplatform*_qpa_p.h"`; do git mv $x "${x/_qpa_p.h/_p.h}"; done
includes were renamed using script
for file in `find . -name "*.h" -or -name "*.cpp" -or -name "*.mm"`; do
sed -i -e 's,.*#.*include.*<\(Qt.*/\)\?\(QPlatform.*\)>,#include <qpa/\L\2.h>,g' \
-e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include <qpa/\L\2.h>,g' \
-e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include <qpa/\L\1.h>,g' \
-e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include <qpa/\L\1_p.h>,g' \
-e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <qpa/\2\3>,g' \
-e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <qpa/\2\3>,g' \
$file
done
Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2012-04-26 23:33:35 +00:00
|
|
|
%deprecatedheaders = (
|
|
|
|
"QtGui" => {
|
2012-07-03 16:25:46 +00:00
|
|
|
"QGenericPlugin" => "QtGui/QGenericPlugin",
|
|
|
|
"QGenericPluginFactory" => "QtGui/QGenericPluginFactory"
|
2016-06-02 14:10:01 +00:00
|
|
|
},
|
|
|
|
"QtSql" => {
|
|
|
|
"qsql.h" => "QtSql/qtsqlglobal.h"
|
2016-06-15 13:42:10 +00:00
|
|
|
},
|
|
|
|
"QtDBus" => {
|
|
|
|
"qdbusmacros.h" => "QtDbus/qtdbusglobal.h"
|
2018-02-13 11:25:10 +00:00
|
|
|
},
|
|
|
|
"QtTest" => {
|
|
|
|
"qtest_global.h" => "QtTest/qttestglobal.h"
|
Expose QPA API under qpa/*
The main reasons for doing this are:
1. _qpa.h end up in the master QtGui include file. QtGui is meant for
userland applications. qpa code is neither binary nor source compatible.
Inadvertant use of QPA api makes the user code binary-incompatible.
2. syncqt creates forwarding headers for non-private header files. This
gives people the impression that this is public API.
As discussed on the mailing list, even though QPA api is internal and subject
to change, it needs to treated differently from private headers since they
will be used by in-qtbase and out-of-qtbase plugins.
This commit does the following:
1. The _qpa in QPA header files is dropped.
2. syncqt now treats any file with qplatform prefix as a special file and
moves it to qpa/ directory. The recommended way of using QPA API in plugins
is: #include <qpa/qplatformfoo.h>. This allows the user include QPA API
from multiple modules (for example, qplatformfoo might be in QtPrintSupport)
3. The user needs to explicitly add QT += <module>-private to get access to
the qpa api.
4. Creates compat headers for the olden style qplatformfoo_qpa.h and QPlatformFoo
includes.
This commit does not change the cpp filenames. This requires a more careful
merging of existing non qpa cpp files and existing cpp files on a case by
case basis. This can be done at anytime.
The following files are not renamed as part of this changed but will be fixed
as part of a future change:
src/gui/kernel/qgenericpluginfactory_qpa.h
src/gui/kernel/qgenericplugin_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa.h
files were renamed using
for x in `find . -name "qplatform*_qpa.h"`; do git mv $x "${x/_qpa.h/.h}"; done
for x in `find . -name "qplatform*_qpa_p.h"`; do git mv $x "${x/_qpa_p.h/_p.h}"; done
includes were renamed using script
for file in `find . -name "*.h" -or -name "*.cpp" -or -name "*.mm"`; do
sed -i -e 's,.*#.*include.*<\(Qt.*/\)\?\(QPlatform.*\)>,#include <qpa/\L\2.h>,g' \
-e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include <qpa/\L\2.h>,g' \
-e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include <qpa/\L\1.h>,g' \
-e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include <qpa/\L\1_p.h>,g' \
-e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <qpa/\2\3>,g' \
-e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <qpa/\2\3>,g' \
$file
done
Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2012-04-26 23:33:35 +00:00
|
|
|
}
|
|
|
|
);
|
2010-11-25 02:21:06 +00:00
|
|
|
|
2020-07-29 13:41:52 +00:00
|
|
|
@qpa_headers = ( qr/^qplatform/, qr/^qwindowsystem/ );
|
2012-11-26 14:23:20 +00:00
|
|
|
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 );
|
Remove ANGLE
This marks the end of EGL and OpenGL ES support on Windows.
The concepts of -opengl dynamic, -opengl desktop, QT_OPENGL=software,
etc. remain unchanged, with the exception of the disapperance of
everything ANGLE related.
CMake builds now work identically to qmake on Windows: they default to
'dynamic' OpenGL on Windows, unless -DINPUT_opengl=desktop is specified.
On Windows, Qt 6 is expected to default to the "dynamic" OpenGL model by
default, just like Qt 5.15. This can be changed by switching to "desktop"
OpenGL, which will link to opengl32 (publicly, so other libs and applications
will do so as well) and disallows using another OpenGL DLL.
The "dynamic" mode is essential still because the fallback to a software
rasterizer, such as the opengl32sw.dll we ship with the Qt packages,
has to to work exactly like in Qt 5, the removal of ANGLE does not
change this concept in any way (except of course that the middle option
of using ANGLE is now gone)
When it comes to the windows plugin's OpenGL blacklist feature, it works
like before and accepts the ANGLE/D3D related keywords. They will
then be ignored. Similarly, requesting QT_OPENGL=angle is ignored (but
will show a warning).
The D3D11 and DXGI configure time tests are removed: Qt 5.14 already
depends on D3D 11.1 and DXGI 1.3 headers being available unconditionally
on Win32 (in QRhi's D3D11 backend). No need to test for these.
[ChangeLog][Windows] ANGLE is no longer included with Qt. Dynamic OpenGL
builds work like before but ANGLE is no longer an option. OpenGL proper
or an alternative opengl32 implementation are the two remaining options
now. Attempting to set QT_OPENGL=angle or Qt::AA_UseOpenGLES will have
no effect on Windows.
Fixes: QTBUG-79103
Change-Id: Ia404e0d07f3fe191b27434d863c81180112ecb3b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-05-18 13:16:30 +00:00
|
|
|
@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers);
|
|
|
|
@ignore_for_qt_begin_namespace_check = ( "qt_windows.h", @zlib_headers);
|
2017-01-31 14:04:33 +00:00
|
|
|
%inject_headers = (
|
|
|
|
"$basedir/src/corelib/global" => [ "qconfig.h", "qconfig_p.h" ],
|
2017-03-27 18:45:36 +00:00
|
|
|
"$basedir/src/gui/vulkan" => [ "^qvulkanfunctions.h", "^qvulkanfunctions_p.h" ]
|
2017-01-31 14:04:33 +00:00
|
|
|
);
|