diff --git a/examples/widgets/doc/images/settingseditor-example.png b/examples/widgets/doc/images/settingseditor-example.png deleted file mode 100644 index 7a5be05fd0f..00000000000 Binary files a/examples/widgets/doc/images/settingseditor-example.png and /dev/null differ diff --git a/examples/widgets/doc/src/settingseditor.qdoc b/examples/widgets/doc/src/settingseditor.qdoc deleted file mode 100644 index 43c45008dc2..00000000000 --- a/examples/widgets/doc/src/settingseditor.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 tools/settingseditor - \title Settings Editor Example - \examplecategory {User Interface Components} - \ingroup examples-widgets-tools - - \brief The Settings Editor example shows how Qt's standard settings support is used in an - application by providing an editor that enables the user to view the settings for - installed applications, and modify those that can be edited. - - \image settingseditor-example.png -*/ diff --git a/examples/widgets/tools/CMakeLists.txt b/examples/widgets/tools/CMakeLists.txt index 1d0f35e1559..a3250884dc0 100644 --- a/examples/widgets/tools/CMakeLists.txt +++ b/examples/widgets/tools/CMakeLists.txt @@ -4,7 +4,6 @@ qt_internal_add_example(completer) qt_internal_add_example(customcompleter) qt_internal_add_example(regularexpression) -qt_internal_add_example(settingseditor) qt_internal_add_example(styleplugin) qt_internal_add_example(treemodelcompleter) qt_internal_add_example(undoframework) diff --git a/examples/widgets/tools/settingseditor/CMakeLists.txt b/examples/widgets/tools/settingseditor/CMakeLists.txt deleted file mode 100644 index 7ffa732f2b6..00000000000 --- a/examples/widgets/tools/settingseditor/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(settingseditor LANGUAGES CXX) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/settingseditor") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_standard_project_setup() - -qt_add_executable(settingseditor - locationdialog.cpp locationdialog.h - main.cpp - mainwindow.cpp mainwindow.h - settingstree.cpp settingstree.h - variantdelegate.cpp variantdelegate.h -) - -set_target_properties(settingseditor PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(settingseditor PRIVATE - Qt6::Core - Qt6::Gui - Qt6::Widgets -) - -install(TARGETS settingseditor - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro index 09b693dc154..5a8b6ec7ced 100644 --- a/examples/widgets/tools/tools.pro +++ b/examples/widgets/tools/tools.pro @@ -4,7 +4,6 @@ SUBDIRS = \ customcompleter \ echoplugin \ regularexpression \ - settingseditor \ styleplugin \ treemodelcompleter \ undoframework diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index ba4bb1f778b..81b03c27258 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2121,10 +2121,6 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, as QString. The numeric value can be recovered using \l QString::toInt(), \l QString::toDouble() and related functions. - The \l{tools/settingseditor}{Settings Editor} example lets you - experiment with different settings location and with fallbacks - turned on or off. - \section1 Restoring the State of a GUI Application QSettings is often used to store the state of a GUI @@ -2365,7 +2361,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, \endlist - \sa QVariant, QSessionManager, {Settings Editor Example} + \sa QVariant, QSessionManager */ /*! \enum QSettings::Status diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index 1c1dec68d21..84a8223bfe3 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -282,7 +282,7 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const the style for drawing. \sa {Delegate Classes}, QStyledItemDelegate, QAbstractItemDelegate, - {Spin Box Delegate Example}, {Settings Editor Example} + {Spin Box Delegate Example} */ /*! diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index 51e31deffbe..8e46a0efbe1 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -2453,7 +2453,7 @@ void QTreeWidgetPrivate::dataChanged(const QModelIndex &topLeft, whether sorting is enabled. \sa QTreeWidgetItem, QTreeWidgetItemIterator, QTreeView, - {Model/View Programming}, {Settings Editor Example} + {Model/View Programming} */ /*! diff --git a/tests/manual/examples/widgets/tools/settingseditor/CMakeLists.txt b/tests/manual/examples/widgets/tools/settingseditor/CMakeLists.txt new file mode 100644 index 00000000000..c7f65b15634 --- /dev/null +++ b/tests/manual/examples/widgets/tools/settingseditor/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +qt_internal_add_manual_test(settingseditor + SOURCES + locationdialog.cpp locationdialog.h + main.cpp + mainwindow.cpp mainwindow.h + settingstree.cpp settingstree.h + variantdelegate.cpp variantdelegate.h + LIBRARIES + Qt::Widgets +) diff --git a/examples/widgets/tools/settingseditor/inifiles/licensepage.ini b/tests/manual/examples/widgets/tools/settingseditor/inifiles/licensepage.ini similarity index 100% rename from examples/widgets/tools/settingseditor/inifiles/licensepage.ini rename to tests/manual/examples/widgets/tools/settingseditor/inifiles/licensepage.ini diff --git a/examples/widgets/tools/settingseditor/inifiles/qsa.ini b/tests/manual/examples/widgets/tools/settingseditor/inifiles/qsa.ini similarity index 100% rename from examples/widgets/tools/settingseditor/inifiles/qsa.ini rename to tests/manual/examples/widgets/tools/settingseditor/inifiles/qsa.ini diff --git a/examples/widgets/tools/settingseditor/locationdialog.cpp b/tests/manual/examples/widgets/tools/settingseditor/locationdialog.cpp similarity index 100% rename from examples/widgets/tools/settingseditor/locationdialog.cpp rename to tests/manual/examples/widgets/tools/settingseditor/locationdialog.cpp diff --git a/examples/widgets/tools/settingseditor/locationdialog.h b/tests/manual/examples/widgets/tools/settingseditor/locationdialog.h similarity index 100% rename from examples/widgets/tools/settingseditor/locationdialog.h rename to tests/manual/examples/widgets/tools/settingseditor/locationdialog.h diff --git a/examples/widgets/tools/settingseditor/main.cpp b/tests/manual/examples/widgets/tools/settingseditor/main.cpp similarity index 100% rename from examples/widgets/tools/settingseditor/main.cpp rename to tests/manual/examples/widgets/tools/settingseditor/main.cpp diff --git a/examples/widgets/tools/settingseditor/mainwindow.cpp b/tests/manual/examples/widgets/tools/settingseditor/mainwindow.cpp similarity index 100% rename from examples/widgets/tools/settingseditor/mainwindow.cpp rename to tests/manual/examples/widgets/tools/settingseditor/mainwindow.cpp diff --git a/examples/widgets/tools/settingseditor/mainwindow.h b/tests/manual/examples/widgets/tools/settingseditor/mainwindow.h similarity index 100% rename from examples/widgets/tools/settingseditor/mainwindow.h rename to tests/manual/examples/widgets/tools/settingseditor/mainwindow.h diff --git a/examples/widgets/tools/settingseditor/settingseditor.pro b/tests/manual/examples/widgets/tools/settingseditor/settingseditor.pro similarity index 100% rename from examples/widgets/tools/settingseditor/settingseditor.pro rename to tests/manual/examples/widgets/tools/settingseditor/settingseditor.pro diff --git a/examples/widgets/tools/settingseditor/settingstree.cpp b/tests/manual/examples/widgets/tools/settingseditor/settingstree.cpp similarity index 100% rename from examples/widgets/tools/settingseditor/settingstree.cpp rename to tests/manual/examples/widgets/tools/settingseditor/settingstree.cpp diff --git a/examples/widgets/tools/settingseditor/settingstree.h b/tests/manual/examples/widgets/tools/settingseditor/settingstree.h similarity index 100% rename from examples/widgets/tools/settingseditor/settingstree.h rename to tests/manual/examples/widgets/tools/settingseditor/settingstree.h diff --git a/examples/widgets/tools/settingseditor/variantdelegate.cpp b/tests/manual/examples/widgets/tools/settingseditor/variantdelegate.cpp similarity index 100% rename from examples/widgets/tools/settingseditor/variantdelegate.cpp rename to tests/manual/examples/widgets/tools/settingseditor/variantdelegate.cpp diff --git a/examples/widgets/tools/settingseditor/variantdelegate.h b/tests/manual/examples/widgets/tools/settingseditor/variantdelegate.h similarity index 100% rename from examples/widgets/tools/settingseditor/variantdelegate.h rename to tests/manual/examples/widgets/tools/settingseditor/variantdelegate.h