summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-10-12 11:39:26 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-10-15 18:45:26 +0000
commitec774500fb964f039bc47abce67e655699d374f7 (patch)
tree95deab176baad70e15650c536e2d57725e32e455 /src/3rdparty
parentcd62d2810ba89243a0f6da43befcd0ebd557c4d8 (diff)
cleanup related to transitive dependencies
public uses of external libraries are automatically transitive now, so we can remove some parts which were only meant to pull in transitive dependencies manually. this is particularly good for includes() of parts of QtPlatformSupport, which actually redundantly pulled in the library's sources. this required making the freetype and fontconfig dependencies public, which is ok, as in the end, they are used only by platform plugins, so there is no point in making them private, as plugins are not linked against anyway (except statically, but there public vs. private doesn't apply anyway). Change-Id: Ia2a32f50dc0f8472285675a0903e6ecd142a03b2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/freetype_dependency.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
index ca871a92d7..c477e6fdea 100644
--- a/src/3rdparty/freetype_dependency.pri
+++ b/src/3rdparty/freetype_dependency.pri
@@ -1,5 +1,5 @@
qtConfig(system-freetype) {
- QMAKE_USE_PRIVATE += freetype/nolink
+ QMAKE_USE += freetype/nolink
} else: qtConfig(freetype) {
- QMAKE_USE_PRIVATE += freetype
+ QMAKE_USE += freetype
}