diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-09-18 10:52:32 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-11-16 13:08:04 +0100 |
| commit | 802e5a45baf3ac7da2cb3be06d10bdd69696fcae (patch) | |
| tree | 2b038b59059ab10454f6c4e451034b3be1e1e1cb | |
| 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 <joerg.bornemann@qt.io>
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 30 | ||||
| -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 |
4 files changed, 35 insertions, 2 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index bc20251bd9..964e256ee0 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -89,4 +89,32 @@ TARGET = $$THE_TARGET # In static builds of Qt, convenience libraries must be installed, # as in this case they are not linked to the final library/plugin. -installed|if(!not_installed:qtConfig(static)): load(qt_installs) +installed|if(!not_installed:qtConfig(static)) { + !isEmpty(MODULE_EXT_HEADERS) { + headers.files = $${MODULE_EXT_HEADERS} + headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET + INSTALLS += headers + } else { + !isEmpty(MODULE_EXT_HEADERS_DIR) { + headers.files = $$MODULE_EXT_HEADERS_DIR/* + headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET + INSTALLS += headers + } + } + + CONFIG += qt_install_module + rpl_header_base = $$MODULE_INCLUDEPATH + rpl_lib_base = $${MODULE_LIBS} + qqt_dir = \$\$\$\$[QT_INSTALL_HEADERS] + pri_header_replace.match = $$rpl_header_base + pri_header_replace.replace = $$qqt_dir/$$TARGET + pri_header_replace.CONFIG = path + pri_header_replace.filename = qt_ext_$${MODULE}.pri + qqt_dir = \$\$\$\$[QT_INSTALL_LIBS] + pri_lib_replace.match = $$rpl_lib_base + pri_lib_replace.replace = $$qqt_dir/$$prefix$${THE_TARGET}.$$suffix + pri_lib_replace.CONFIG = path + pri_lib_replace.filename = qt_ext_$${MODULE}.pri + QMAKE_INSTALL_REPLACE += pri_header_replace pri_lib_replace + load(qt_installs) +} diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro index 0665de521b..7dce10a902 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 752d349ebc..8b53f3e990 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 a2f56669b4..b71dfefd20 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) |