summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/harfbuzz_dependency.pri
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-09-30 20:53:53 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-10-15 18:45:10 +0000
commit9a088e78690a3052f9c2d7e388e37957c2470ab1 (patch)
treec49c2c62ac517ad28265257797b195275b7a9cee /src/3rdparty/harfbuzz_dependency.pri
parent81755e96230753fc70cecf3c6be28237015cdf9b (diff)
use helper libs via QMAKE_USE
for that, qt_help_lib.prf gains the ability to write "external module pri" files that contain suitable information for QMAKE_USE. these files have a bunch of limitations: - they are not installed, because a) they are not relocatable and b) the helper libs' headers are not installed, either - it won't work with qmake -r, which is ok, as qt5 does not build with qmake -r anyway - deps are not transitive, neither at build nor at use time the freetype, harfbuzz-ng, pcre, and png helper libs have been adjusted accordingly, and their uses replaced with QMAKE_USE instances. this also allowed inlining the now trivial {harfbuzz,pcrc,png}_dependency.pri files. freetype_dependency.pri remains due to its funkiness. Change-Id: I16890eecb122e34ec49f3d3e68380d1ea71a198a Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/3rdparty/harfbuzz_dependency.pri')
-rw-r--r--src/3rdparty/harfbuzz_dependency.pri6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
deleted file mode 100644
index 5946f403c5..0000000000
--- a/src/3rdparty/harfbuzz_dependency.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-qtConfig(system-harfbuzz) {
- QMAKE_USE_PRIVATE += harfbuzz
-} else: qtConfig(harfbuzz) {
- INCLUDEPATH += $$PWD/harfbuzz-ng/include
- LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
-}