Fix build on Harmattan when cross-compiling
When configure detects the presence of font-config/freetype via pkg-config _and_ we are cross-compiling for Harmattan, make sure that we pick up the include path for freetype. The .pri file is included in various places in qtbase when the usage of freetype is required. Change-Id: I4a5390dfc063504def80a891bc9153d6a376ccd7 Reviewed-on: http://codereview.qt-project.org/6509 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
parent
8346c192ad
commit
28c0b26fb7
@ -6,4 +6,9 @@
|
||||
p = $$join(p, "", "", "/freetype2")
|
||||
exists($$p):INCLUDEPATH *= $$p
|
||||
}
|
||||
} else {
|
||||
# If we are cross-compiling, then there is still a remote possibility that
|
||||
# configure detected font-config & freetype, stored in these variables.
|
||||
QMAKE_CFLAGS += $$QMAKE_CFLAGS_FONTCONFIG
|
||||
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user