diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/gui/text/text.pri | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/gui/text/text.pri')
| -rw-r--r-- | src/gui/text/text.pri | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index c6bdfbd9c2..63a731f116 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -9,7 +9,6 @@ HEADERS += \ text/qfontmetrics.h \ text/qfont_p.h \ text/qfontsubset_p.h \ - text/qlinecontrol_p.h \ text/qtextengine_p.h \ text/qtextlayout.h \ text/qtextformat.h \ @@ -23,8 +22,6 @@ HEADERS += \ text/qtexthtmlparser_p.h \ text/qabstracttextdocumentlayout.h \ text/qtextdocumentlayout_p.h \ - text/qtextcontrol_p.h \ - text/qtextcontrol_p_p.h \ text/qtextcursor.h \ text/qtextcursor_p.h \ text/qtextdocumentfragment.h \ @@ -53,8 +50,6 @@ SOURCES += \ text/qfontsubset.cpp \ text/qfontmetrics.cpp \ text/qfontdatabase.cpp \ - text/qlinecontrol.cpp \ - text/qtextcontrol.cpp \ text/qtextengine.cpp \ text/qtextlayout.cpp \ text/qtextformat.cpp \ @@ -107,25 +102,5 @@ SOURCES += \ HEADERS += \ text/qplatformfontdatabase_qpa.h -symbian { - SOURCES += \ - text/qfont_s60.cpp - contains(QT_CONFIG, freetype) { - SOURCES += \ - text/qfontengine_ft.cpp \ - text/qrawfont_ft.cpp - HEADERS += \ - text/qfontengine_ft_p.h - DEFINES += \ - QT_NO_FONTCONFIG - } else { - SOURCES += \ - text/qfontengine_s60.cpp - HEADERS += \ - text/qfontengine_s60_p.h - } - LIBS += -lfntstr -lecom -} - DEFINES += QT_NO_OPENTYPE INCLUDEPATH += ../3rdparty/harfbuzz/src |