From eba9bad43145a00529bdf7e5becfbb063e50c673 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 2 May 2011 16:01:57 +0200 Subject: QWS removal, part 2 --- src/gui/text/text.pri | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'src/gui/text/text.pri') diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index df9398ce59..a1e7eb1652 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -103,7 +103,7 @@ unix:x11 { text/qrawfont_ft.cpp } -!embedded:!qpa:!x11:mac { +!qpa:!x11:mac { HEADERS += \ text/qfontengine_mac_p.h OBJECTIVE_HEADERS += \ @@ -116,22 +116,6 @@ unix:x11 { text/qfontengine_mac.mm } -embedded { - SOURCES += \ - text/qfont_qws.cpp \ - text/qfontengine_qws.cpp \ - text/qfontengine_ft.cpp \ - text/qfontengine_qpf.cpp \ - text/qabstractfontengine_qws.cpp \ - text/qrawfont_ft.cpp - HEADERS += \ - text/qfontengine_ft_p.h \ - text/qfontengine_qpf_p.h \ - text/qabstractfontengine_qws.h \ - text/qabstractfontengine_p.h - DEFINES += QT_NO_FONTCONFIG -} - qpa { SOURCES += \ text/qfont_qpa.cpp \ @@ -228,9 +212,7 @@ contains(QT_CONFIG, freetype) { DEFINES += FT2_BUILD_LIBRARY FT_CONFIG_OPTION_SYSTEM_ZLIB - embedded:CONFIG += opentype } else:contains(QT_CONFIG, system-freetype) { - embedded:CONFIG += opentype # pull in the proper freetype2 include directory include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) LIBS_PRIVATE += -lfreetype -- cgit v1.2.3 From 3e8b53a46ce8c54de17b0ae6bf5a6fa3eacaa143 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 4 May 2011 13:08:02 +0200 Subject: moving some more files around. --- src/gui/text/text.pri | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gui/text/text.pri') diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index ba6ddb32f0..7a9aee62fd 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -9,7 +9,8 @@ HEADERS += \ text/qfontmetrics.h \ text/qfont_p.h \ text/qfontsubset_p.h \ - text/qtextcontrol_p.h \ + text/qlinecontrol_p.h \ + text/qtextcontrol_p.h \ text/qtextcontrol_p_p.h \ text/qtextengine_p.h \ text/qtextlayout.h \ @@ -51,7 +52,8 @@ SOURCES += \ text/qfontsubset.cpp \ text/qfontmetrics.cpp \ text/qfontdatabase.cpp \ - text/qtextcontrol.cpp \ + text/qlinecontrol.cpp \ + text/qtextcontrol.cpp \ text/qtextengine.cpp \ text/qtextlayout.cpp \ text/qtextformat.cpp \ -- cgit v1.2.3 From 2bcd79e213f9637b4c12e7c82a74e621ec0f3ca3 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 5 May 2011 14:07:23 +0200 Subject: remove some more qapp dependencies --- src/gui/text/text.pri | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/gui/text/text.pri') diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 7a9aee62fd..24f9c5f0e4 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -9,10 +9,7 @@ HEADERS += \ text/qfontmetrics.h \ text/qfont_p.h \ text/qfontsubset_p.h \ - text/qlinecontrol_p.h \ - text/qtextcontrol_p.h \ - text/qtextcontrol_p_p.h \ - text/qtextengine_p.h \ + text/qtextengine_p.h \ text/qtextlayout.h \ text/qtextformat.h \ text/qtextformat_p.h \ @@ -52,9 +49,7 @@ SOURCES += \ text/qfontsubset.cpp \ text/qfontmetrics.cpp \ text/qfontdatabase.cpp \ - text/qlinecontrol.cpp \ - text/qtextcontrol.cpp \ - text/qtextengine.cpp \ + text/qtextengine.cpp \ text/qtextlayout.cpp \ text/qtextformat.cpp \ text/qtextobject.cpp \ -- cgit v1.2.3 From ed529bbf4992a12163070c9a92af1a6a4e5b97aa Mon Sep 17 00:00:00 2001 From: Olli Werwolff Date: Wed, 25 May 2011 10:11:58 +0200 Subject: Compile fix for QtGui when configure with -qpa on Windows Reviewed-by: Friedemann Kleint --- src/gui/text/text.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/text/text.pri') diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 6357dec1d2..23c863392a 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -74,7 +74,7 @@ SOURCES += \ text/qrawfont.cpp \ text/qglyphrun.cpp -win32 { +win32:!qpa { SOURCES += \ text/qfont_win.cpp \ text/qfontengine_win.cpp \ -- cgit v1.2.3 From eaedcefbf8dbdc77dec07922777cb7dc68740888 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 5 Jul 2011 13:03:09 +0200 Subject: add QTextControl class to QtGui This is a reduced version of the old text control class, that doesn't support a few QWidget specific additions. Change-Id: Ib4542845a30473bb2462b2fe14daba178b571368 --- src/gui/text/text.pri | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/gui/text/text.pri') diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index e8535e089c..cf14f743f5 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -22,7 +22,9 @@ HEADERS += \ text/qtexthtmlparser_p.h \ text/qabstracttextdocumentlayout.h \ text/qtextdocumentlayout_p.h \ - text/qtextcursor.h \ + text/qtextcontrol_p.h \ + text/qtextcontrol_p_p.h \ + text/qtextcursor.h \ text/qtextcursor_p.h \ text/qtextdocumentfragment.h \ text/qtextdocumentfragment_p.h \ @@ -50,6 +52,7 @@ SOURCES += \ text/qfontsubset.cpp \ text/qfontmetrics.cpp \ text/qfontdatabase.cpp \ + text/qtextcontrol.cpp \ text/qtextengine.cpp \ text/qtextlayout.cpp \ text/qtextformat.cpp \ -- cgit v1.2.3 From 8d7647e286e07690de15a6ff9189307ee1a3517c Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 5 Jul 2011 13:05:37 +0200 Subject: added a QLineControl class to QtGui The class does not have support for completion, but is otherwise mostly on par with the control in QtWidgets. Change-Id: I2c89f8ea910cfacba67d4e5e56d8d650d27760b9 --- src/gui/text/text.pri | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gui/text/text.pri') diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index cf14f743f5..5e5f8e31c8 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -9,6 +9,7 @@ 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 \ @@ -52,6 +53,7 @@ SOURCES += \ text/qfontsubset.cpp \ text/qfontmetrics.cpp \ text/qfontdatabase.cpp \ + text/qlinecontrol.cpp \ text/qtextcontrol.cpp \ text/qtextengine.cpp \ text/qtextlayout.cpp \ -- cgit v1.2.3