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",
|
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
|
|
|
"QtAccessibilitySupport" => "$basedir/src/platformsupport/accessibility",
|
2017-09-08 16:00:05 +00:00
|
|
|
"QtWindowsUIAutomationSupport" => "$basedir/src/platformsupport/windowsuiautomation",
|
2016-10-12 09:55:52 +00:00
|
|
|
"QtLinuxAccessibilitySupport" => "$basedir/src/platformsupport/linuxaccessibility",
|
|
|
|
|
"QtClipboardSupport" => "$basedir/src/platformsupport/clipboard",
|
|
|
|
|
"QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery",
|
|
|
|
|
"QtEventDispatcherSupport" => "$basedir/src/platformsupport/eventdispatchers",
|
|
|
|
|
"QtFontDatabaseSupport" => "$basedir/src/platformsupport/fontdatabases",
|
|
|
|
|
"QtInputSupport" => "$basedir/src/platformsupport/input",
|
platformsupport/input: add xkbcommon utilities lib
xcb/eglfs/wayland - all use XKB keyboard configs and APIs. There
is a lot of duplicated and naturally a diverging code. This patch
adds a helper library to avoid all the mentioned problems and unify
feature set between these platforms.
qlibinputkeyboard:
Added a fixup for 2803cdf758dbae1006a0c50300af12dac9f71531. From
spec: "keysyms, when bound to modifiers, affect the rules [..]",
meaning we can't look at keys in isolation, but have to check if
bounding exists in the keymap. This is done by using
xkb_state_mod_name_is_active() API, but that API has its limitations -
https://github.com/xkbcommon/libxkbcommon/issues/88
I will fix this separately in the LTS (5.12) branch.
We need to read the modifier state before the key action. This
patch fixes a regression introduced by aforementioned patch, which
caused modifiers being reported wrongly in QKeyEvent::modifiers().
qtwayland:
Moved toKeysym(QKeyEvent) from qtwayland repository into this library.
For this and other key mapping functionality wayland was duplicating
the key table. All of that will be removed from qtwayland, and calls
will be replaced to use this lib. Adjusted toKeysym() to fix QTBUG-71301.
Qt keys don't map to ASCII codes, so first we need search in our key
table, instead of mapping from unicode.
lookupStringNoKeysymTransformations():
fixed off-by-one error, where we were including terminating NUL in
QString.
Fixes: QTBUG-71301
Task-number: QTBUG-65503
Change-Id: Idfddea5b34ad620235dc08c0b9e5a0669111821a
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
2018-11-30 11:14:51 +00:00
|
|
|
"QtXkbCommonSupport" => "$basedir/src/platformsupport/input/xkbcommon",
|
2016-10-12 09:55:52 +00:00
|
|
|
"QtPlatformCompositorSupport" => "$basedir/src/platformsupport/platformcompositor",
|
|
|
|
|
"QtServiceSupport" => "$basedir/src/platformsupport/services",
|
|
|
|
|
"QtThemeSupport" => "$basedir/src/platformsupport/themes",
|
|
|
|
|
"QtGraphicsSupport" => "$basedir/src/platformsupport/graphics",
|
|
|
|
|
"QtEglSupport" => "$basedir/src/platformsupport/eglconvenience",
|
|
|
|
|
"QtFbSupport" => "$basedir/src/platformsupport/fbconvenience",
|
|
|
|
|
"QtGlxSupport" => "$basedir/src/platformsupport/glxconvenience",
|
2016-10-04 09:29:26 +00:00
|
|
|
"QtKmsSupport" => "$basedir/src/platformsupport/kmsconvenience",
|
2017-01-06 19:04:04 +00:00
|
|
|
"QtEdidSupport" => "$basedir/src/platformsupport/edid",
|
2017-01-31 14:04:33 +00:00
|
|
|
"QtVulkanSupport" => "$basedir/src/platformsupport/vkconvenience",
|
2019-10-21 08:09:03 +00:00
|
|
|
"QtLinuxOfonoSupport" => "$basedir/src/platformsupport/linuxofono",
|
2014-03-17 09:35:35 +00:00
|
|
|
"QtPlatformHeaders" => "$basedir/src/platformheaders",
|
2013-06-05 11:24:23 +00:00
|
|
|
"QtANGLE/KHR" => "!$basedir/src/3rdparty/angle/include/KHR",
|
|
|
|
|
"QtANGLE/GLES2" => "!$basedir/src/3rdparty/angle/include/GLES2",
|
2014-08-05 09:59:44 +00:00
|
|
|
"QtANGLE/GLES3" => "!$basedir/src/3rdparty/angle/include/GLES3",
|
2013-06-05 11:24:23 +00:00
|
|
|
"QtANGLE/EGL" => "!$basedir/src/3rdparty/angle/include/EGL",
|
2015-11-10 17:40:04 +00:00
|
|
|
"QtZlib" => "!>$basedir/src/corelib;$basedir/src/3rdparty/zlib",
|
2013-01-27 15:53:13 +00:00
|
|
|
"QtOpenGLExtensions" => "$basedir/src/openglextensions",
|
2016-05-27 08:04:03 +00:00
|
|
|
"QtEglFSDeviceIntegration" => "$basedir/src/plugins/platforms/eglfs",
|
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",
|
2019-05-24 12:27:48 +00:00
|
|
|
"qlist.h" => "QList",
|
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",
|
|
|
|
|
);
|
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
|
|
|
|
2015-06-03 12:10:19 +00:00
|
|
|
@qpa_headers = ( qr/^(?!qplatformheaderhelper)qplatform/, qr/^qwindowsystem/ );
|
2018-10-15 22:59:39 +00:00
|
|
|
my @angle_headers = ('egl.h', 'eglext.h', 'eglext_angle.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2ext_angle.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h');
|
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 );
|
2013-03-10 08:55:27 +00:00
|
|
|
@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h", @zlib_headers, @angle_headers);
|
2016-08-15 09:33:56 +00:00
|
|
|
@ignore_for_qt_begin_namespace_check = ( "qt_windows.h", @zlib_headers, @angle_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
|
|
|
);
|
