diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 11:49:35 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 11:54:30 (GMT) |
| commit | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (patch) | |
| tree | 72031d16ebed89a60590ce2392803888f99369f7 /src/gui/text/text.pri | |
| parent | 06dc8791a70329dc8e985a0eed7e434d1f762ec5 (diff) | |
| parent | 8f9d38ed63a2c568596febe5ea59a55fe03d7ba9 (diff) | |
| download | Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.zip Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.tar.gz Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Conflicts:
src/gui/text/text.pri
src/plugins/generic/linuxinput/qlinuxinput.cpp
Diffstat (limited to 'src/gui/text/text.pri')
| -rw-r--r-- | src/gui/text/text.pri | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index af8cc24..0040b54 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -25,7 +25,7 @@ HEADERS += \ text/qabstracttextdocumentlayout.h \ text/qtextdocumentlayout_p.h \ text/qtextcursor.h \ - text/qtextcursor_p.h \ + text/qtextcursor_p.h \ text/qtextdocumentfragment.h \ text/qtextdocumentfragment_p.h \ text/qtextimagehandler_p.h \ @@ -115,15 +115,15 @@ embedded { qpa { SOURCES += \ - text/qfont_qws.cpp \ - text/qfontengine_ft.cpp \ - text/qfontengine_qpf.cpp \ - text/qabstractfontengine_qws.cpp + text/qfont_qpa.cpp \ + text/qfontengine_qpa.cpp \ + text/qplatformfontdatabase_qpa.cpp + HEADERS += \ - text/qfontengine_ft_p.h \ - text/qabstractfontengine_qws.h \ - text/qabstractfontengine_p.h + text/qplatformfontdatabase_qpa.h + DEFINES += QT_NO_FONTCONFIG + DEFINES += QT_NO_FREETYPE } symbian { @@ -145,6 +145,7 @@ symbian { } } +!qpa { contains(QT_CONFIG, freetype) { SOURCES += \ ../3rdparty/freetype/src/base/ftbase.c \ @@ -218,6 +219,7 @@ contains(QT_CONFIG, freetype) { contains(QT_CONFIG, fontconfig) { CONFIG += opentype } +}#!qpa DEFINES += QT_NO_OPENTYPE INCLUDEPATH += ../3rdparty/harfbuzz/src |