AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix non-git shadow builds

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2015-02-16 15:31:58 +01:00 committed by Jani Heikkinen
parent 21d1faae1a
commit 69196b38c4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro vendored
View File

@ -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 \

1
src/src.pro
View File

@ -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