diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 11:43:13 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-07-28 11:43:13 +0200 |
| commit | 84294f47e55073914bcbcdbaf85df1a0e2e2d845 (patch) | |
| tree | 1166be97fcfcc6a71b9603443ef6360d33aef276 /src/gui/text/text.pri | |
| parent | 80e13f5bd418395bd64396e359a288b748ae1dfb (diff) | |
| parent | 7b10151cb6550fe8060217fad8549950eadd5fca (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'src/gui/text/text.pri')
| -rw-r--r-- | src/gui/text/text.pri | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 889fb2c4d3..102df4d41d 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -200,8 +200,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) { |