From a76b6ca309a342d6bc4b41eb9ba5daf731b45daf Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Wed, 8 Jul 2009 16:23:25 +0200 Subject: Properly disable Freetype if Qt is not configured with support for it. If we don't build with Freetype support then Qt's build system assumes that the QT_NO_FREETYPE macro is defined somewhere, but it previously wasn't. This makes sure it ends up in qconfig.h. --- tools/configure/configureapp.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7cdb063..c6e04b9 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2787,6 +2787,7 @@ void Configure::generateConfigfiles() if(dictionary["PHONON"] == "no") qconfigList += "QT_NO_PHONON"; if(dictionary["XMLPATTERNS"] == "no") qconfigList += "QT_NO_XMLPATTERNS"; if(dictionary["SCRIPTTOOLS"] == "no") qconfigList += "QT_NO_SCRIPTTOOLS"; + if(dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE"; if(dictionary["OPENGL_ES_CM"] == "yes" || dictionary["OPENGL_ES_CL"] == "yes" || -- cgit v0.12