diff options
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/freetype_dependency.pri | 8 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz_dependency.pri | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri index 39280deb2f..7513e40bfd 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -1,7 +1,7 @@ -contains(QT_CONFIG, freetype) { - INCLUDEPATH += $$PWD/freetype/include - LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix() -} else:contains(QT_CONFIG, system-freetype) { +contains(QT_CONFIG, system-freetype) { # pull in the proper freetype2 include directory include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) +} else: contains(QT_CONFIG, freetype) { + INCLUDEPATH += $$PWD/freetype/include + LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtfreetype$$qtPlatformTargetSuffix() } diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri index 74433688f6..36abbfbe35 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -1,6 +1,6 @@ -contains(QT_CONFIG, harfbuzz) { +contains(QT_CONFIG, system-harfbuzz) { + LIBS_PRIVATE += -lharfbuzz +} else: contains(QT_CONFIG, harfbuzz) { INCLUDEPATH += $$PWD/harfbuzz-ng/include LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix() -} else:contains(QT_CONFIG, system-harfbuzz) { - LIBS_PRIVATE += -lharfbuzz } |