projects / profile / ivi / qtbase.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 69bf305) | patch
Fix cross-compilation that uses fontconfig / freetype
authorThiago Macieira <thiago.macieira@intel.com>
Thu, 22 Sep 2011 11:18:11 +0000 (13:18 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 22 Mar 2012 17:59:45 +0000 (18:59 +0100)
commitd6d4dcaf18e060644ffed5af991ba63e22367394
tree38ffbf3432cd850fc3b09fb8315da0aedb3258a3tree | snapshot
parent69bf30596c2555b4430383d7edc4f1dbe04e72fccommit | diff
Fix cross-compilation that uses fontconfig / freetype

config.tests/unix/freetype.pri has a !cross_compile flag, so we must
find freetype using the proper detection methods. The detection was
inside an X11 section of configure, so move that out.

And use the results of that detection, now that QMAKE_CFLAGS_X11 isn't
used (since we're not building X11 in QtPlatformSupport).

Change-Id: Ic8f5cfb7263849bfb12967756def2b5aaa244872
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
configure diff | blob | history
src/platformsupport/fontdatabases/fontconfig/fontconfig.pri diff | blob | history
Domain: UI Framework / Uncategorized;