diff --git a/examples/widgets/doc/images/stylesheet-pagefold.png b/examples/widgets/doc/images/stylesheet-pagefold.png deleted file mode 100644 index d1358f326b5..00000000000 Binary files a/examples/widgets/doc/images/stylesheet-pagefold.png and /dev/null differ diff --git a/examples/widgets/doc/src/stylesheet.qdoc b/examples/widgets/doc/src/stylesheet.qdoc deleted file mode 100644 index b85ccdb015b..00000000000 --- a/examples/widgets/doc/src/stylesheet.qdoc +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example widgets/stylesheet - \title Style Sheet Example - \ingroup examples-widgets - \brief The Style Sheet Example shows how to use style sheets. - - \borderedimage stylesheet-pagefold.png - \caption Screen Shot of the Pagefold style sheet - - The Style Sheet example shows how widgets can be styled using Qt Style Sheets. - You can open the style editor by selecting \uicontrol File > \uicontrol Edit Style Sheet, - to select an existing style sheet or design your own style and load it. - - The Style Sheet example consists of 2 classes: - \list - \li \c MainWindow - \li \c StyleSheetEditor - \endlist - - - \section1 MainWindow Class - - \c MainWindow inherits QWidget, and is the application's main window defined in - \c mainwindow.ui. The style of \c MainWindow can be modified with \c StyleSheetEditor. - - - \section1 StyleSheetEditor Class - - \c StyleSheetEditor enables you to open an editor where you can load an existing style sheet. - It is also possible to define a new stylesheet and load it. Its layout is defined in - \c stylesheeteditor.ui. - - \quotefromfile widgets/stylesheet/stylesheeteditor.cpp - \skipto setStyleName - \printline setStyleName - - Sets the specified \a styleName and grays the \c applyButton. - - \skipto setStyleSheetName - \printline setStyleSheetName - - Loads the stylesheet from \c styleSheetName. - - \skipto setModified() - \printline setModified() - - Enables the \c applyButton when the text in the buffer has changed. - - \skipto apply() - \printline apply() - - Sets the stylesheet properties in \l qApp and disables the \c applyButton. - - \skipto loadStyleSheet(const QString &sheetName) - \printline loadStyleSheet(const QString &sheetName) - - Loads the specified \a sheetName, and sets its properties in - \l qApp. - -*/ - diff --git a/examples/widgets/widgets/CMakeLists.txt b/examples/widgets/widgets/CMakeLists.txt index 9c2ea872fc1..43d03bdea25 100644 --- a/examples/widgets/widgets/CMakeLists.txt +++ b/examples/widgets/widgets/CMakeLists.txt @@ -12,7 +12,6 @@ qt_internal_add_example(shortcuteditor) qt_internal_add_example(sliders) qt_internal_add_example(spinboxes) qt_internal_add_example(styles) -qt_internal_add_example(stylesheet) qt_internal_add_example(tablet) qt_internal_add_example(tetrix) qt_internal_add_example(tooltips) diff --git a/examples/widgets/widgets/widgets.pro b/examples/widgets/widgets/widgets.pro index 8de3dadcaa6..45d9e662dff 100644 --- a/examples/widgets/widgets/widgets.pro +++ b/examples/widgets/widgets/widgets.pro @@ -9,7 +9,6 @@ SUBDIRS = analogclock \ sliders \ spinboxes \ styles \ - stylesheet \ tablet \ tetrix \ tooltips \ diff --git a/src/widgets/doc/images/stylesheet-coffee-cleanlooks.png b/src/widgets/doc/images/stylesheet-coffee-cleanlooks.png deleted file mode 100644 index e75df0d80a3..00000000000 Binary files a/src/widgets/doc/images/stylesheet-coffee-cleanlooks.png and /dev/null differ diff --git a/src/widgets/doc/images/stylesheet-pagefold-mac.png b/src/widgets/doc/images/stylesheet-pagefold-mac.png deleted file mode 100644 index 5c061b9cfd5..00000000000 Binary files a/src/widgets/doc/images/stylesheet-pagefold-mac.png and /dev/null differ diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc index 5315fe85d45..fa48777c303 100644 --- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -85,22 +85,7 @@ buttons and check boxes to make them stand out. Using this technique, you can also achieve minor customizations that would normally require subclassing several style classes, such as - specifying a \l{QStyle::styleHint()}{style hint}. The - \l{widgets/stylesheet}{Style Sheet} example depicted below defines - two distinctive style sheets that you can try out and modify at - will. - - \table - \row \li \inlineimage stylesheet-pagefold.png - \row \li Pagefold theme running on Windows - \endtable - - \table - \row \li \inlineimage stylesheet-coffee-cleanlooks.png - \li \inlineimage stylesheet-pagefold-mac.png - \row \li Coffee theme running on Ubuntu Linux - \li Pagefold theme running on \macos - \endtable + specifying a \l{QStyle::styleHint()}{style hint}. When a style sheet is active, the QStyle returned by QWidget::style() is a wrapper "style sheet" style, \e not the platform-specific style. The @@ -4073,7 +4058,7 @@ \image stylesheet-treeview.png - \sa {Style Sheet Example}, {Supported HTML Subset}, QStyle + \sa {Supported HTML Subset}, QStyle \section1 Common Mistakes diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/tests/manual/examples/widgets/widgets/stylesheet/CMakeLists.txt similarity index 100% rename from examples/widgets/widgets/stylesheet/CMakeLists.txt rename to tests/manual/examples/widgets/widgets/stylesheet/CMakeLists.txt diff --git a/examples/widgets/widgets/stylesheet/images/checkbox_checked.png b/tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_checked.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/checkbox_checked.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_checked.png diff --git a/examples/widgets/widgets/stylesheet/images/checkbox_checked_hover.png b/tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_checked_hover.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/checkbox_checked_hover.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_checked_hover.png diff --git a/examples/widgets/widgets/stylesheet/images/checkbox_checked_pressed.png b/tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_checked_pressed.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/checkbox_checked_pressed.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_checked_pressed.png diff --git a/examples/widgets/widgets/stylesheet/images/checkbox_unchecked.png b/tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_unchecked.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/checkbox_unchecked.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_unchecked.png diff --git a/examples/widgets/widgets/stylesheet/images/checkbox_unchecked_hover.png b/tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_unchecked_hover.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/checkbox_unchecked_hover.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_unchecked_hover.png diff --git a/examples/widgets/widgets/stylesheet/images/checkbox_unchecked_pressed.png b/tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_unchecked_pressed.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/checkbox_unchecked_pressed.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/checkbox_unchecked_pressed.png diff --git a/examples/widgets/widgets/stylesheet/images/down_arrow.png b/tests/manual/examples/widgets/widgets/stylesheet/images/down_arrow.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/down_arrow.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/down_arrow.png diff --git a/examples/widgets/widgets/stylesheet/images/down_arrow_disabled.png b/tests/manual/examples/widgets/widgets/stylesheet/images/down_arrow_disabled.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/down_arrow_disabled.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/down_arrow_disabled.png diff --git a/examples/widgets/widgets/stylesheet/images/frame.png b/tests/manual/examples/widgets/widgets/stylesheet/images/frame.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/frame.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/frame.png diff --git a/examples/widgets/widgets/stylesheet/images/pagefold.png b/tests/manual/examples/widgets/widgets/stylesheet/images/pagefold.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/pagefold.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/pagefold.png diff --git a/examples/widgets/widgets/stylesheet/images/pushbutton.png b/tests/manual/examples/widgets/widgets/stylesheet/images/pushbutton.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/pushbutton.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/pushbutton.png diff --git a/examples/widgets/widgets/stylesheet/images/pushbutton_hover.png b/tests/manual/examples/widgets/widgets/stylesheet/images/pushbutton_hover.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/pushbutton_hover.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/pushbutton_hover.png diff --git a/examples/widgets/widgets/stylesheet/images/pushbutton_pressed.png b/tests/manual/examples/widgets/widgets/stylesheet/images/pushbutton_pressed.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/pushbutton_pressed.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/pushbutton_pressed.png diff --git a/examples/widgets/widgets/stylesheet/images/radiobutton_checked.png b/tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_checked.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/radiobutton_checked.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_checked.png diff --git a/examples/widgets/widgets/stylesheet/images/radiobutton_checked_hover.png b/tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_checked_hover.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/radiobutton_checked_hover.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_checked_hover.png diff --git a/examples/widgets/widgets/stylesheet/images/radiobutton_checked_pressed.png b/tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_checked_pressed.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/radiobutton_checked_pressed.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_checked_pressed.png diff --git a/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked.png b/tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/radiobutton_unchecked.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked.png diff --git a/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked_hover.png b/tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked_hover.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/radiobutton_unchecked_hover.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked_hover.png diff --git a/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked_pressed.png b/tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked_pressed.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/radiobutton_unchecked_pressed.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/radiobutton_unchecked_pressed.png diff --git a/examples/widgets/widgets/stylesheet/images/sizegrip.png b/tests/manual/examples/widgets/widgets/stylesheet/images/sizegrip.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/sizegrip.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/sizegrip.png diff --git a/examples/widgets/widgets/stylesheet/images/spindown.png b/tests/manual/examples/widgets/widgets/stylesheet/images/spindown.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/spindown.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/spindown.png diff --git a/examples/widgets/widgets/stylesheet/images/spindown_hover.png b/tests/manual/examples/widgets/widgets/stylesheet/images/spindown_hover.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/spindown_hover.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/spindown_hover.png diff --git a/examples/widgets/widgets/stylesheet/images/spindown_off.png b/tests/manual/examples/widgets/widgets/stylesheet/images/spindown_off.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/spindown_off.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/spindown_off.png diff --git a/examples/widgets/widgets/stylesheet/images/spindown_pressed.png b/tests/manual/examples/widgets/widgets/stylesheet/images/spindown_pressed.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/spindown_pressed.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/spindown_pressed.png diff --git a/examples/widgets/widgets/stylesheet/images/spinup.png b/tests/manual/examples/widgets/widgets/stylesheet/images/spinup.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/spinup.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/spinup.png diff --git a/examples/widgets/widgets/stylesheet/images/spinup_hover.png b/tests/manual/examples/widgets/widgets/stylesheet/images/spinup_hover.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/spinup_hover.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/spinup_hover.png diff --git a/examples/widgets/widgets/stylesheet/images/spinup_off.png b/tests/manual/examples/widgets/widgets/stylesheet/images/spinup_off.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/spinup_off.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/spinup_off.png diff --git a/examples/widgets/widgets/stylesheet/images/spinup_pressed.png b/tests/manual/examples/widgets/widgets/stylesheet/images/spinup_pressed.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/spinup_pressed.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/spinup_pressed.png diff --git a/examples/widgets/widgets/stylesheet/images/up_arrow.png b/tests/manual/examples/widgets/widgets/stylesheet/images/up_arrow.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/up_arrow.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/up_arrow.png diff --git a/examples/widgets/widgets/stylesheet/images/up_arrow_disabled.png b/tests/manual/examples/widgets/widgets/stylesheet/images/up_arrow_disabled.png similarity index 100% rename from examples/widgets/widgets/stylesheet/images/up_arrow_disabled.png rename to tests/manual/examples/widgets/widgets/stylesheet/images/up_arrow_disabled.png diff --git a/examples/widgets/widgets/stylesheet/layouts/default.ui b/tests/manual/examples/widgets/widgets/stylesheet/layouts/default.ui similarity index 100% rename from examples/widgets/widgets/stylesheet/layouts/default.ui rename to tests/manual/examples/widgets/widgets/stylesheet/layouts/default.ui diff --git a/examples/widgets/widgets/stylesheet/layouts/pagefold.ui b/tests/manual/examples/widgets/widgets/stylesheet/layouts/pagefold.ui similarity index 100% rename from examples/widgets/widgets/stylesheet/layouts/pagefold.ui rename to tests/manual/examples/widgets/widgets/stylesheet/layouts/pagefold.ui diff --git a/examples/widgets/widgets/stylesheet/main.cpp b/tests/manual/examples/widgets/widgets/stylesheet/main.cpp similarity index 100% rename from examples/widgets/widgets/stylesheet/main.cpp rename to tests/manual/examples/widgets/widgets/stylesheet/main.cpp diff --git a/examples/widgets/widgets/stylesheet/mainwindow.cpp b/tests/manual/examples/widgets/widgets/stylesheet/mainwindow.cpp similarity index 100% rename from examples/widgets/widgets/stylesheet/mainwindow.cpp rename to tests/manual/examples/widgets/widgets/stylesheet/mainwindow.cpp diff --git a/examples/widgets/widgets/stylesheet/mainwindow.h b/tests/manual/examples/widgets/widgets/stylesheet/mainwindow.h similarity index 100% rename from examples/widgets/widgets/stylesheet/mainwindow.h rename to tests/manual/examples/widgets/widgets/stylesheet/mainwindow.h diff --git a/examples/widgets/widgets/stylesheet/mainwindow.ui b/tests/manual/examples/widgets/widgets/stylesheet/mainwindow.ui similarity index 100% rename from examples/widgets/widgets/stylesheet/mainwindow.ui rename to tests/manual/examples/widgets/widgets/stylesheet/mainwindow.ui diff --git a/examples/widgets/widgets/stylesheet/qss/coffee.qss b/tests/manual/examples/widgets/widgets/stylesheet/qss/coffee.qss similarity index 100% rename from examples/widgets/widgets/stylesheet/qss/coffee.qss rename to tests/manual/examples/widgets/widgets/stylesheet/qss/coffee.qss diff --git a/examples/widgets/widgets/stylesheet/qss/default.qss b/tests/manual/examples/widgets/widgets/stylesheet/qss/default.qss similarity index 100% rename from examples/widgets/widgets/stylesheet/qss/default.qss rename to tests/manual/examples/widgets/widgets/stylesheet/qss/default.qss diff --git a/examples/widgets/widgets/stylesheet/qss/pagefold.qss b/tests/manual/examples/widgets/widgets/stylesheet/qss/pagefold.qss similarity index 100% rename from examples/widgets/widgets/stylesheet/qss/pagefold.qss rename to tests/manual/examples/widgets/widgets/stylesheet/qss/pagefold.qss diff --git a/examples/widgets/widgets/stylesheet/stylesheet.pro b/tests/manual/examples/widgets/widgets/stylesheet/stylesheet.pro similarity index 100% rename from examples/widgets/widgets/stylesheet/stylesheet.pro rename to tests/manual/examples/widgets/widgets/stylesheet/stylesheet.pro diff --git a/examples/widgets/widgets/stylesheet/stylesheet.qrc b/tests/manual/examples/widgets/widgets/stylesheet/stylesheet.qrc similarity index 100% rename from examples/widgets/widgets/stylesheet/stylesheet.qrc rename to tests/manual/examples/widgets/widgets/stylesheet/stylesheet.qrc diff --git a/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp b/tests/manual/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp similarity index 100% rename from examples/widgets/widgets/stylesheet/stylesheeteditor.cpp rename to tests/manual/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp diff --git a/examples/widgets/widgets/stylesheet/stylesheeteditor.h b/tests/manual/examples/widgets/widgets/stylesheet/stylesheeteditor.h similarity index 100% rename from examples/widgets/widgets/stylesheet/stylesheeteditor.h rename to tests/manual/examples/widgets/widgets/stylesheet/stylesheeteditor.h diff --git a/examples/widgets/widgets/stylesheet/stylesheeteditor.ui b/tests/manual/examples/widgets/widgets/stylesheet/stylesheeteditor.ui similarity index 100% rename from examples/widgets/widgets/stylesheet/stylesheeteditor.ui rename to tests/manual/examples/widgets/widgets/stylesheet/stylesheeteditor.ui