From d6d4dcaf18e060644ffed5af991ba63e22367394 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 22 Sep 2011 13:18:11 +0200 Subject: 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 --- src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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 -- cgit v1.2.3