diff options
| author | Michal Klocek <[email protected]> | 2020-09-18 10:52:32 +0200 |
|---|---|---|
| committer | Michal Klocek <[email protected]> | 2020-11-16 13:08:04 +0100 |
| commit | 802e5a45baf3ac7da2cb3be06d10bdd69696fcae (patch) | |
| tree | 2b038b59059ab10454f6c4e451034b3be1e1e1cb /src | |
| parent | 125113c9099e04efdbef7939c3976ee5e2c0ba29 (diff) | |
Install 3rd party headers and meta for static builds
When doing static builds any project which uses same
libraries as qtbase 3rd party libraries will most likely
end up in broken binaries, since symbols will be
included twice. Moreover, libraries can have different
versions. Install 3rd party headers and meta data for:
* qtlibpng
* qtfreetype
* qtharbuzz
Pick-to: 5.15
Task-number: QTBUG-87154
Change-Id: I243dff9a12a95af20dee414f55bb762b8d579c81
Reviewed-by: Joerg Bornemann <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/freetype/freetype.pro | 1 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 5 | ||||
| -rw-r--r-- | src/3rdparty/libpng/libpng.pro | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro index 0665de521bf..7dce10a902a 100644 --- a/src/3rdparty/freetype/freetype.pro +++ b/src/3rdparty/freetype/freetype.pro @@ -7,6 +7,7 @@ CONFIG += \ installed MODULE_INCLUDEPATH += $$PWD/include +MODULE_EXT_HEADERS_DIR = $$PWD/include load(qt_helper_lib) diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index 752d349ebcf..8b53f3e990e 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -7,7 +7,6 @@ CONFIG += \ MODULE_INCLUDEPATH += $$PWD/include/harfbuzz -load(qt_helper_lib) # built-in shapers list configuration: SHAPERS += opentype # HB's main shaper; enabling it should be enough most of the time @@ -176,9 +175,13 @@ contains(SHAPERS, opentype) { $$PWD/src/hb-ot-var.h } +MODULE_EXT_HEADERS = $$HEADERS + contains(SHAPERS, fallback)|isEmpty(SHAPERS) { DEFINES += HAVE_FALLBACK SOURCES += \ $$PWD/src/hb-fallback-shape.cc } + +load(qt_helper_lib) diff --git a/src/3rdparty/libpng/libpng.pro b/src/3rdparty/libpng/libpng.pro index a2f56669b47..b71dfefd200 100644 --- a/src/3rdparty/libpng/libpng.pro +++ b/src/3rdparty/libpng/libpng.pro @@ -7,6 +7,7 @@ CONFIG += \ installed MODULE_INCLUDEPATH = $$PWD +MODULE_EXT_HEADERS = png.h pngconf.h load(qt_helper_lib) |