diff options
| author | axis <qt-info@nokia.com> | 2010-07-15 09:05:37 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-21 09:40:04 (GMT) |
| commit | 74868367dce9038dfbac574196e6b2d75ab977e7 (patch) | |
| tree | e8fe8e3b3e8645fffb0cf72db76387bc2deb269c | |
| parent | 7a19192fb418e40732ad72e0d4aaf83527958ded (diff) | |
| download | Qt-74868367dce9038dfbac574196e6b2d75ab977e7.zip Qt-74868367dce9038dfbac574196e6b2d75ab977e7.tar.gz Qt-74868367dce9038dfbac574196e6b2d75ab977e7.tar.bz2 | |
Fixed QT_NO_FREETYPE define.
This define is also used by the OpenVG module, and therefore needs
to be defined everywhere.
RevBy: Jason Barron
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | src/gui/text/text.pri | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -6687,6 +6687,7 @@ elif [ "$CFG_TIFF" = "yes" ]; then fi if [ "$CFG_LIBFREETYPE" = "no" ]; then QT_CONFIG="$QT_CONFIG no-freetype" + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FREETYPE" elif [ "$CFG_LIBFREETYPE" = "system" ]; then QT_CONFIG="$QT_CONFIG system-freetype" else diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 34311a9..af8daa5 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -197,8 +197,6 @@ contains(QT_CONFIG, freetype) { # pull in the proper freetype2 include directory include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) LIBS_PRIVATE += -lfreetype -} else { - DEFINES *= QT_NO_FREETYPE } contains(QT_CONFIG, fontconfig) { |