diff --git a/examples/widgets/doc/images/textedit-demo.png b/examples/widgets/doc/images/textedit-demo.png deleted file mode 100644 index 3cf2883a122..00000000000 Binary files a/examples/widgets/doc/images/textedit-demo.png and /dev/null differ diff --git a/examples/widgets/doc/src/textedit.qdoc b/examples/widgets/doc/src/textedit.qdoc deleted file mode 100644 index f41a58fe907..00000000000 --- a/examples/widgets/doc/src/textedit.qdoc +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example richtext/textedit - \title Text Edit - \ingroup examples-richtext - \brief The Text Edit example shows Qt's rich text editing facilities - in action. - - \brief The Text Edit example shows Qt's rich text editing facilities in action, - providing an example document for you to experiment with. - - \image textedit-demo.png -*/ diff --git a/examples/widgets/richtext/CMakeLists.txt b/examples/widgets/richtext/CMakeLists.txt index 6fe7ea0c5e3..a01296d6f75 100644 --- a/examples/widgets/richtext/CMakeLists.txt +++ b/examples/widgets/richtext/CMakeLists.txt @@ -3,4 +3,3 @@ qt_internal_add_example(orderform) qt_internal_add_example(syntaxhighlighter) -qt_internal_add_example(textedit) diff --git a/examples/widgets/richtext/richtext.pro b/examples/widgets/richtext/richtext.pro index 40b41ff81bf..0d7f6c942af 100644 --- a/examples/widgets/richtext/richtext.pro +++ b/examples/widgets/richtext/richtext.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs SUBDIRS = orderform \ - syntaxhighlighter \ - textedit + syntaxhighlighter diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index baf3794f2bf..5e25d63eae8 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -9906,10 +9906,6 @@ void QWidget::actionEvent(QActionEvent *) Main window applications typically use reimplementations of this function to check whether the user's work has been saved and ask for permission before closing. - For example, the \l{Text Edit} example uses a helper function to - determine whether or not to close the window: - - \snippet richtext/textedit/textedit.cpp closeevent \sa event(), hide(), close(), QCloseEvent */ diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/tests/manual/examples/widgets/richtext/textedit/CMakeLists.txt similarity index 100% rename from examples/widgets/richtext/textedit/CMakeLists.txt rename to tests/manual/examples/widgets/richtext/textedit/CMakeLists.txt diff --git a/examples/widgets/richtext/textedit/example.html b/tests/manual/examples/widgets/richtext/textedit/example.html similarity index 100% rename from examples/widgets/richtext/textedit/example.html rename to tests/manual/examples/widgets/richtext/textedit/example.html diff --git a/examples/widgets/richtext/textedit/example.md b/tests/manual/examples/widgets/richtext/textedit/example.md similarity index 100% rename from examples/widgets/richtext/textedit/example.md rename to tests/manual/examples/widgets/richtext/textedit/example.md diff --git a/examples/widgets/richtext/textedit/images/logo32.png b/tests/manual/examples/widgets/richtext/textedit/images/logo32.png similarity index 100% rename from examples/widgets/richtext/textedit/images/logo32.png rename to tests/manual/examples/widgets/richtext/textedit/images/logo32.png diff --git a/examples/widgets/richtext/textedit/images/mac/checkbox-checked.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/checkbox-checked.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/checkbox-checked.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/checkbox-checked.png diff --git a/examples/widgets/richtext/textedit/images/mac/checkbox.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/checkbox.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/checkbox.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/checkbox.png diff --git a/examples/widgets/richtext/textedit/images/mac/editcopy.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/editcopy.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/editcopy.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/editcopy.png diff --git a/examples/widgets/richtext/textedit/images/mac/editcut.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/editcut.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/editcut.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/editcut.png diff --git a/examples/widgets/richtext/textedit/images/mac/editpaste.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/editpaste.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/editpaste.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/editpaste.png diff --git a/examples/widgets/richtext/textedit/images/mac/editredo.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/editredo.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/editredo.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/editredo.png diff --git a/examples/widgets/richtext/textedit/images/mac/editundo.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/editundo.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/editundo.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/editundo.png diff --git a/examples/widgets/richtext/textedit/images/mac/exportpdf.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/exportpdf.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/exportpdf.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/exportpdf.png diff --git a/examples/widgets/richtext/textedit/images/mac/filenew.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/filenew.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/filenew.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/filenew.png diff --git a/examples/widgets/richtext/textedit/images/mac/fileopen.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/fileopen.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/fileopen.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/fileopen.png diff --git a/examples/widgets/richtext/textedit/images/mac/fileprint.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/fileprint.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/fileprint.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/fileprint.png diff --git a/examples/widgets/richtext/textedit/images/mac/filesave.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/filesave.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/filesave.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/filesave.png diff --git a/examples/widgets/richtext/textedit/images/mac/format-indent-less.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/format-indent-less.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/format-indent-less.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/format-indent-less.png diff --git a/examples/widgets/richtext/textedit/images/mac/format-indent-more.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/format-indent-more.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/format-indent-more.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/format-indent-more.png diff --git a/examples/widgets/richtext/textedit/images/mac/textbold.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/textbold.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/textbold.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/textbold.png diff --git a/examples/widgets/richtext/textedit/images/mac/textcenter.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/textcenter.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/textcenter.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/textcenter.png diff --git a/examples/widgets/richtext/textedit/images/mac/textitalic.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/textitalic.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/textitalic.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/textitalic.png diff --git a/examples/widgets/richtext/textedit/images/mac/textjustify.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/textjustify.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/textjustify.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/textjustify.png diff --git a/examples/widgets/richtext/textedit/images/mac/textleft.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/textleft.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/textleft.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/textleft.png diff --git a/examples/widgets/richtext/textedit/images/mac/textright.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/textright.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/textright.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/textright.png diff --git a/examples/widgets/richtext/textedit/images/mac/textunder.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/textunder.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/textunder.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/textunder.png diff --git a/examples/widgets/richtext/textedit/images/mac/textundercolor.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/textundercolor.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/textundercolor.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/textundercolor.png diff --git a/examples/widgets/richtext/textedit/images/mac/zoomin.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/zoomin.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/zoomin.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/zoomin.png diff --git a/examples/widgets/richtext/textedit/images/mac/zoomout.png b/tests/manual/examples/widgets/richtext/textedit/images/mac/zoomout.png similarity index 100% rename from examples/widgets/richtext/textedit/images/mac/zoomout.png rename to tests/manual/examples/widgets/richtext/textedit/images/mac/zoomout.png diff --git a/examples/widgets/richtext/textedit/images/win/checkbox-checked.png b/tests/manual/examples/widgets/richtext/textedit/images/win/checkbox-checked.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/checkbox-checked.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/checkbox-checked.png diff --git a/examples/widgets/richtext/textedit/images/win/checkbox.png b/tests/manual/examples/widgets/richtext/textedit/images/win/checkbox.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/checkbox.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/checkbox.png diff --git a/examples/widgets/richtext/textedit/images/win/editcopy.png b/tests/manual/examples/widgets/richtext/textedit/images/win/editcopy.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/editcopy.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/editcopy.png diff --git a/examples/widgets/richtext/textedit/images/win/editcut.png b/tests/manual/examples/widgets/richtext/textedit/images/win/editcut.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/editcut.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/editcut.png diff --git a/examples/widgets/richtext/textedit/images/win/editpaste.png b/tests/manual/examples/widgets/richtext/textedit/images/win/editpaste.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/editpaste.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/editpaste.png diff --git a/examples/widgets/richtext/textedit/images/win/editredo.png b/tests/manual/examples/widgets/richtext/textedit/images/win/editredo.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/editredo.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/editredo.png diff --git a/examples/widgets/richtext/textedit/images/win/editundo.png b/tests/manual/examples/widgets/richtext/textedit/images/win/editundo.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/editundo.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/editundo.png diff --git a/examples/widgets/richtext/textedit/images/win/exportpdf.png b/tests/manual/examples/widgets/richtext/textedit/images/win/exportpdf.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/exportpdf.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/exportpdf.png diff --git a/examples/widgets/richtext/textedit/images/win/filenew.png b/tests/manual/examples/widgets/richtext/textedit/images/win/filenew.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/filenew.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/filenew.png diff --git a/examples/widgets/richtext/textedit/images/win/fileopen.png b/tests/manual/examples/widgets/richtext/textedit/images/win/fileopen.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/fileopen.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/fileopen.png diff --git a/examples/widgets/richtext/textedit/images/win/fileprint.png b/tests/manual/examples/widgets/richtext/textedit/images/win/fileprint.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/fileprint.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/fileprint.png diff --git a/examples/widgets/richtext/textedit/images/win/filesave.png b/tests/manual/examples/widgets/richtext/textedit/images/win/filesave.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/filesave.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/filesave.png diff --git a/examples/widgets/richtext/textedit/images/win/format-indent-less.png b/tests/manual/examples/widgets/richtext/textedit/images/win/format-indent-less.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/format-indent-less.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/format-indent-less.png diff --git a/examples/widgets/richtext/textedit/images/win/format-indent-more.png b/tests/manual/examples/widgets/richtext/textedit/images/win/format-indent-more.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/format-indent-more.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/format-indent-more.png diff --git a/examples/widgets/richtext/textedit/images/win/textbold.png b/tests/manual/examples/widgets/richtext/textedit/images/win/textbold.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/textbold.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/textbold.png diff --git a/examples/widgets/richtext/textedit/images/win/textcenter.png b/tests/manual/examples/widgets/richtext/textedit/images/win/textcenter.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/textcenter.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/textcenter.png diff --git a/examples/widgets/richtext/textedit/images/win/textitalic.png b/tests/manual/examples/widgets/richtext/textedit/images/win/textitalic.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/textitalic.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/textitalic.png diff --git a/examples/widgets/richtext/textedit/images/win/textjustify.png b/tests/manual/examples/widgets/richtext/textedit/images/win/textjustify.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/textjustify.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/textjustify.png diff --git a/examples/widgets/richtext/textedit/images/win/textleft.png b/tests/manual/examples/widgets/richtext/textedit/images/win/textleft.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/textleft.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/textleft.png diff --git a/examples/widgets/richtext/textedit/images/win/textright.png b/tests/manual/examples/widgets/richtext/textedit/images/win/textright.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/textright.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/textright.png diff --git a/examples/widgets/richtext/textedit/images/win/textunder.png b/tests/manual/examples/widgets/richtext/textedit/images/win/textunder.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/textunder.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/textunder.png diff --git a/examples/widgets/richtext/textedit/images/win/textundercolor.png b/tests/manual/examples/widgets/richtext/textedit/images/win/textundercolor.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/textundercolor.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/textundercolor.png diff --git a/examples/widgets/richtext/textedit/images/win/zoomin.png b/tests/manual/examples/widgets/richtext/textedit/images/win/zoomin.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/zoomin.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/zoomin.png diff --git a/examples/widgets/richtext/textedit/images/win/zoomout.png b/tests/manual/examples/widgets/richtext/textedit/images/win/zoomout.png similarity index 100% rename from examples/widgets/richtext/textedit/images/win/zoomout.png rename to tests/manual/examples/widgets/richtext/textedit/images/win/zoomout.png diff --git a/examples/widgets/richtext/textedit/main.cpp b/tests/manual/examples/widgets/richtext/textedit/main.cpp similarity index 100% rename from examples/widgets/richtext/textedit/main.cpp rename to tests/manual/examples/widgets/richtext/textedit/main.cpp diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/tests/manual/examples/widgets/richtext/textedit/textedit.cpp similarity index 100% rename from examples/widgets/richtext/textedit/textedit.cpp rename to tests/manual/examples/widgets/richtext/textedit/textedit.cpp diff --git a/examples/widgets/richtext/textedit/textedit.h b/tests/manual/examples/widgets/richtext/textedit/textedit.h similarity index 100% rename from examples/widgets/richtext/textedit/textedit.h rename to tests/manual/examples/widgets/richtext/textedit/textedit.h diff --git a/examples/widgets/richtext/textedit/textedit.pro b/tests/manual/examples/widgets/richtext/textedit/textedit.pro similarity index 100% rename from examples/widgets/richtext/textedit/textedit.pro rename to tests/manual/examples/widgets/richtext/textedit/textedit.pro diff --git a/examples/widgets/richtext/textedit/textedit.qdoc b/tests/manual/examples/widgets/richtext/textedit/textedit.qdoc similarity index 100% rename from examples/widgets/richtext/textedit/textedit.qdoc rename to tests/manual/examples/widgets/richtext/textedit/textedit.qdoc diff --git a/examples/widgets/richtext/textedit/textedit.qrc b/tests/manual/examples/widgets/richtext/textedit/textedit.qrc similarity index 100% rename from examples/widgets/richtext/textedit/textedit.qrc rename to tests/manual/examples/widgets/richtext/textedit/textedit.qrc