summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2023-02-08 13:26:22 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2023-02-09 00:23:34 +0100
commit48a1a5564f89e1e8f0b6f4a28398e4ae0b3f751c (patch)
tree9eb617d59bc9aa66b80fc82eb0aa04cacc166b53
parent3fe0bf6e1bd3713543a5b763d3bfcee0c03faf4c (diff)
downloadqtbase-48a1a5564f89e1e8f0b6f4a28398e4ae0b3f751c.tar.gz
Examples: move widgets/codeeditor into manual tests
It's not a very well written example, using (largely unneed) hacks to implement what it does. It's also misleading - the syntaxhighlighter example is a better showcase for building a useful code editor. Move it to manual tests. Fixes: QTBUG-111025 Pick-to: 6.5 Change-Id: I405d41688235bf3e9a08373e716769f26d02fec6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r--doc/src/images/codeeditor-example.pngbin14994 -> 0 bytes
-rw-r--r--examples/widgets/doc/src/syntaxhighlighter.qdoc6
-rw-r--r--examples/widgets/widgets/CMakeLists.txt1
-rw-r--r--examples/widgets/widgets/widgets.pro1
-rw-r--r--src/widgets/widgets/qplaintextedit.cpp3
-rw-r--r--tests/manual/textrendering/codeeditor/CMakeLists.txt (renamed from examples/widgets/widgets/codeeditor/CMakeLists.txt)0
-rw-r--r--tests/manual/textrendering/codeeditor/codeeditor.cpp (renamed from examples/widgets/widgets/codeeditor/codeeditor.cpp)0
-rw-r--r--tests/manual/textrendering/codeeditor/codeeditor.h (renamed from examples/widgets/widgets/codeeditor/codeeditor.h)0
-rw-r--r--tests/manual/textrendering/codeeditor/codeeditor.pro (renamed from examples/widgets/widgets/codeeditor/codeeditor.pro)0
-rw-r--r--tests/manual/textrendering/codeeditor/codeeditor.qdoc (renamed from examples/widgets/doc/src/codeeditor.qdoc)0
-rw-r--r--tests/manual/textrendering/codeeditor/main.cpp (renamed from examples/widgets/widgets/codeeditor/main.cpp)0
11 files changed, 1 insertions, 10 deletions
diff --git a/doc/src/images/codeeditor-example.png b/doc/src/images/codeeditor-example.png
deleted file mode 100644
index 32cf94779f..0000000000
--- a/doc/src/images/codeeditor-example.png
+++ /dev/null
Binary files differ
diff --git a/examples/widgets/doc/src/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc
index 1b4ef2561b..bdd13abdf3 100644
--- a/examples/widgets/doc/src/syntaxhighlighter.qdoc
+++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc
@@ -219,10 +219,4 @@
function. The QSyntaxHighlighter class also provides the \l
{QSyntaxHighlighter::document()}{document()} function which
returns the currently set document.
-
- \section1 Other Code Editor Features
-
- The \l{Code Editor Example} shows how to implement line
- numbers and how to highlight the current line.
-
*/
diff --git a/examples/widgets/widgets/CMakeLists.txt b/examples/widgets/widgets/CMakeLists.txt
index ee90c019b0..d852233c8d 100644
--- a/examples/widgets/widgets/CMakeLists.txt
+++ b/examples/widgets/widgets/CMakeLists.txt
@@ -5,7 +5,6 @@ qt_internal_add_example(analogclock)
qt_internal_add_example(calculator)
qt_internal_add_example(calendarwidget)
qt_internal_add_example(charactermap)
-qt_internal_add_example(codeeditor)
qt_internal_add_example(digitalclock)
qt_internal_add_example(groupbox)
qt_internal_add_example(icons)
diff --git a/examples/widgets/widgets/widgets.pro b/examples/widgets/widgets/widgets.pro
index 1dd736e56f..36d428429c 100644
--- a/examples/widgets/widgets/widgets.pro
+++ b/examples/widgets/widgets/widgets.pro
@@ -3,7 +3,6 @@ SUBDIRS = analogclock \
calculator \
calendarwidget \
charactermap \
- codeeditor \
digitalclock \
groupbox \
icons \
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index cd9889e9ff..83156aa6b6 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -1187,8 +1187,7 @@ void QPlainTextEditPrivate::ensureViewportLayouted()
\sa QTextDocument, QTextCursor, {Qt Widgets - Application Example},
- {Code Editor Example}, {Syntax Highlighter Example},
- {Rich Text Processing}
+ {Syntax Highlighter Example}, {Rich Text Processing}
*/
diff --git a/examples/widgets/widgets/codeeditor/CMakeLists.txt b/tests/manual/textrendering/codeeditor/CMakeLists.txt
index 0e8a3b49ff..0e8a3b49ff 100644
--- a/examples/widgets/widgets/codeeditor/CMakeLists.txt
+++ b/tests/manual/textrendering/codeeditor/CMakeLists.txt
diff --git a/examples/widgets/widgets/codeeditor/codeeditor.cpp b/tests/manual/textrendering/codeeditor/codeeditor.cpp
index 15f84622e4..15f84622e4 100644
--- a/examples/widgets/widgets/codeeditor/codeeditor.cpp
+++ b/tests/manual/textrendering/codeeditor/codeeditor.cpp
diff --git a/examples/widgets/widgets/codeeditor/codeeditor.h b/tests/manual/textrendering/codeeditor/codeeditor.h
index e8e6a583f0..e8e6a583f0 100644
--- a/examples/widgets/widgets/codeeditor/codeeditor.h
+++ b/tests/manual/textrendering/codeeditor/codeeditor.h
diff --git a/examples/widgets/widgets/codeeditor/codeeditor.pro b/tests/manual/textrendering/codeeditor/codeeditor.pro
index 5618160d17..5618160d17 100644
--- a/examples/widgets/widgets/codeeditor/codeeditor.pro
+++ b/tests/manual/textrendering/codeeditor/codeeditor.pro
diff --git a/examples/widgets/doc/src/codeeditor.qdoc b/tests/manual/textrendering/codeeditor/codeeditor.qdoc
index 80c11db69d..80c11db69d 100644
--- a/examples/widgets/doc/src/codeeditor.qdoc
+++ b/tests/manual/textrendering/codeeditor/codeeditor.qdoc
diff --git a/examples/widgets/widgets/codeeditor/main.cpp b/tests/manual/textrendering/codeeditor/main.cpp
index 20b72b18ae..20b72b18ae 100644
--- a/examples/widgets/widgets/codeeditor/main.cpp
+++ b/tests/manual/textrendering/codeeditor/main.cpp