diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-16 15:31:58 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-02-16 15:12:30 +0000 |
commit | 69196b38c481610ef30bfe8ce8e7ba6826729ab8 (patch) | |
tree | a83e85c36c2b7303b88f8a5e77ee7736283151bc | |
parent | 21d1faae1aa14614b32e48d22a83958f71045634 (diff) |
fix non-git shadow buildsv5.4.1
the qt headers live in the source dir in this configuration.
instead of hard-coding the path in the project file, use the correct
module variable. this requires harfbuzz-ng to be built after corelib.
Change-Id: If1b64b59a0939d3b5190331fcf70da566d4eeedd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 2 | ||||
-rw-r--r-- | src/src.pro | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index a8885d71df..300b22ec57 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -14,7 +14,7 @@ DEFINES += HAVE_ATEXIT unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD INCLUDEPATH += $$PWD/include -INCLUDEPATH += $$OUT_PWD/../../../include +INCLUDEPATH += $$QT.core.includes SOURCES += \ $$PWD/src/hb-blob.cc \ diff --git a/src/src.pro b/src/src.pro index 81f4fa5256..83f7587f0e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -83,6 +83,7 @@ src_testlib.depends = src_corelib # src_gui & src_widgets are not build-depend src_3rdparty_harfbuzzng.subdir = $$PWD/3rdparty/harfbuzz-ng src_3rdparty_harfbuzzng.target = sub-3rdparty-harfbuzzng +src_3rdparty_harfbuzzng.depends = src_corelib # for the Qt atomics src_angle.subdir = $$PWD/angle src_angle.target = sub-angle |