diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2011-09-22 13:18:11 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 18:59:45 +0100 |
| commit | d6d4dcaf18e060644ffed5af991ba63e22367394 (patch) | |
| tree | 38ffbf3432cd850fc3b09fb8315da0aedb3258a3 /src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | |
| parent | 69bf30596c2555b4430383d7edc4f1dbe04e72fc (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>
Diffstat (limited to 'src/platformsupport/fontdatabases/fontconfig/fontconfig.pri')
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri index af9bd0a01c..bd7294b818 100644 --- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri +++ b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri @@ -3,3 +3,4 @@ HEADERS += $$PWD/qfontconfigdatabase_p.h \ SOURCES += $$PWD/qfontconfigdatabase.cpp \ $$PWD/qfontenginemultifontconfig.cpp DEFINES -= QT_NO_FONTCONFIG +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG |