From 6ca406d43d63d4c6503f2213b6c8cf0f25f6af5e Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Wed, 11 Mar 2015 13:09:48 +0400 Subject: Bring harfbuzzng.pri naming in par with the other .pri-s in src/3rdparty Change-Id: I59bf922e3085a03a4c2c370f42418cb005456d3e Reviewed-by: Oswald Buddenhagen --- src/3rdparty/harfbuzz_dependency.pri | 6 ++++++ src/3rdparty/harfbuzzng.pri | 6 ------ src/gui/text/text.pri | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 src/3rdparty/harfbuzz_dependency.pri delete mode 100644 src/3rdparty/harfbuzzng.pri (limited to 'src') diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri new file mode 100644 index 0000000000..74433688f6 --- /dev/null +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -0,0 +1,6 @@ +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 +} diff --git a/src/3rdparty/harfbuzzng.pri b/src/3rdparty/harfbuzzng.pri deleted file mode 100644 index 74433688f6..0000000000 --- a/src/3rdparty/harfbuzzng.pri +++ /dev/null @@ -1,6 +0,0 @@ -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 -} diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 091129f5be..61e239f678 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -86,7 +86,7 @@ HEADERS += \ contains(QT_CONFIG, harfbuzz)|contains(QT_CONFIG, system-harfbuzz) { DEFINES += QT_ENABLE_HARFBUZZ_NG - include($$PWD/../../3rdparty/harfbuzzng.pri) + include($$PWD/../../3rdparty/harfbuzz_dependency.pri) SOURCES += text/qharfbuzzng.cpp HEADERS += text/qharfbuzzng_p.h -- cgit v1.2.3