diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-08 16:23:25 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-08 16:23:25 +0200 |
| commit | a76b6ca309a342d6bc4b41eb9ba5daf731b45daf (patch) | |
| tree | cd2d35fec161e0856c5d4a4fa89278b70ec63395 /tools/configure/configureapp.cpp | |
| parent | 4611cc655e3e727dd0ece75ad15b53f2bb5b96d5 (diff) | |
| download | qt4-tools-a76b6ca309a342d6bc4b41eb9ba5daf731b45daf.tar.gz | |
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.
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7cdb063a21..c6e04b9092 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" || |