diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-26 01:00:25 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-26 18:39:21 +0100 |
| commit | 75c0ffaf6d2b92cdf26092e01acdd5af4afeac97 (patch) | |
| tree | bb9e85c21248790ec99b3665928872e39b14db64 /examples/widgets/doc | |
| parent | 4753d69d8934258de7fb64550e50a5cbb9b5603f (diff) | |
| parent | 462c2745a5168a5b57381d05779b5d16aebe018e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/network/bearermonitor/CMakeLists.txt
examples/network/CMakeLists.txt
src/corelib/tools/qlinkedlist.h
src/sql/kernel/qsqldriver_p.h
src/sql/kernel/qsqlresult_p.h
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidget_p.h
tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
tests/auto/tools/moc/allmocs_baseline_in.json
Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9
Diffstat (limited to 'examples/widgets/doc')
| -rw-r--r-- | examples/widgets/doc/src/syntaxhighlighter.qdoc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/examples/widgets/doc/src/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc index 8583d86114..618b387ed5 100644 --- a/examples/widgets/doc/src/syntaxhighlighter.qdoc +++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc @@ -246,11 +246,7 @@ \section1 Other Code Editor Features - It is possible to implement parenthesis matching with - QSyntaxHighlighter. The "Matching Parentheses with - QSyntaxHighlighter" article in Qt Quarterly 31 - (\l{http://doc.qt.io/archives/qq/}) implements this. We also have - the \l{Code Editor Example}, which shows how to implement line + The \l{Code Editor Example} shows how to implement line numbers and how to highlight the current line. */ |