diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-12-14 09:54:33 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-02-19 01:52:32 +0100 |
| commit | be2745e4788cecb0d3122081e3328e4b66923609 (patch) | |
| tree | bf15fa44c91f82dd9fb1ade44620de3d175deab5 /sync.profile | |
| parent | 6944b4df7bac464eaee8e03ea724db25303fdbc1 (diff) | |
Install 3rdparty headers for static builds
For static builds we need 3rdparty headers to be installed.
Leaf modules like qtwebengine needs 3rdparty libs and header for
zlib, freetype, harfbuzz, png, jpeg. Without those the Chromium bundled
versions are used, however it might end up badly if qt has already
bundled one.
Introduce new header only modules with additional arguments for
qt_internal_add_module:
* EXTERNAL_HEADERS to pick exactly which headers are public
* EXTERNAL_HEADERS_DIR to include whole directory preserving the
files directory structure
Fix qtsync so it keep directory structure for all non-qt modules when
syncing headers and do not generate warnings for headers files.
Task-number: QTBUG-87154
Task-number: QTBUG-88614
Change-Id: If1c27bf8608791cd4e0a21839d6316a445a96e9f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sync.profile b/sync.profile index 3433b069a3..dc5ce6cd60 100644 --- a/sync.profile +++ b/sync.profile @@ -1,4 +1,8 @@ -%modules = ( # path to module name map +%modules = ( + # path to module name map + # "module_name" => "path to look for headers" + # ! - for non qt module + # > - points to directory where module was defined in cmake file "QtGui" => "$basedir/src/gui", "QtWidgets" => "$basedir/src/widgets", "QtPrintSupport" => "$basedir/src/printsupport", @@ -15,7 +19,11 @@ "QtInputSupport" => "$basedir/src/platformsupport/input", "QtFbSupport" => "$basedir/src/platformsupport/fbconvenience", "QtKmsSupport" => "$basedir/src/platformsupport/kmsconvenience", - "QtZlib" => "!>$basedir/src/corelib;$basedir/src/3rdparty/zlib", + "QtZlib" => "!>$basedir/src/corelib;$basedir/src/3rdparty/zlib/src", + "QtPng" => "!>$basedir/src/3rdparty/libpng;$basedir/src/3rdparty/libpng", + "QtJpeg" => "!>$basedir/src/3rdparty/libjpeg;$basedir/src/3rdparty/libjpeg/src", + "QtHarfbuzz" => "!>$basedir/src/3rdparty/harfbuzz-ng;$basedir/src/3rdparty/harfbuzz-ng/include", + "QtFreetype" => "!>$basedir/src/3rdparty/freetype;$basedir/src/3rdparty/freetype/include", "QtEglFSDeviceIntegration" => "$basedir/src/plugins/platforms/eglfs", "QtEglFsKmsSupport" => "$basedir/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support", "QtEglFsKmsGbmSupport" => "$basedir/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms", |