diff --git a/examples/tools/contiguouscache/randomlistmodel.h b/examples/tools/contiguouscache/randomlistmodel.h index 043fdf7a40..58427f0c53 100644 --- a/examples/tools/contiguouscache/randomlistmodel.h +++ b/examples/tools/contiguouscache/randomlistmodel.h @@ -43,7 +43,8 @@ #include #include -class QTimer; +QT_FORWARD_DECLARE_CLASS(QTimer) + class RandomListModel : public QAbstractListModel { Q_OBJECT diff --git a/examples/tools/customtypesending/window.h b/examples/tools/customtypesending/window.h index 1e60dd6aef..1d7b0b5dc8 100644 --- a/examples/tools/customtypesending/window.h +++ b/examples/tools/customtypesending/window.h @@ -44,7 +44,7 @@ #include #include "message.h" -class QTextEdit; +QT_FORWARD_DECLARE_CLASS(QTextEdit) //! [Window class definition] class Window : public QWidget diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro index c0e5b5aa75..4f02e01f61 100644 --- a/examples/tools/tools.pro +++ b/examples/tools/tools.pro @@ -1,21 +1,8 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = codecs \ - completer \ - customcompleter \ - echoplugin \ - i18n \ - contiguouscache \ - plugandpaintplugins \ - plugandpaint \ - regexp \ - settingseditor \ - styleplugin \ - treemodelcompleter \ - undo \ - undoframework - -plugandpaint.depends = plugandpaintplugins +SUBDIRS = contiguouscache \ + customtype \ + customtypesending # install target.path = $$[QT_INSTALL_EXAMPLES]/tools diff --git a/examples/tools/doc/completer-example-country.png b/examples/widgets/doc/images/completer-example-country.png similarity index 100% rename from examples/tools/doc/completer-example-country.png rename to examples/widgets/doc/images/completer-example-country.png diff --git a/examples/tools/doc/completer-example-word.png b/examples/widgets/doc/images/completer-example-word.png similarity index 100% rename from examples/tools/doc/completer-example-word.png rename to examples/widgets/doc/images/completer-example-word.png diff --git a/examples/tools/doc/completer-example.png b/examples/widgets/doc/images/completer-example.png similarity index 100% rename from examples/tools/doc/completer-example.png rename to examples/widgets/doc/images/completer-example.png diff --git a/examples/tools/doc/echopluginexample.png b/examples/widgets/doc/images/echopluginexample.png similarity index 100% rename from examples/tools/doc/echopluginexample.png rename to examples/widgets/doc/images/echopluginexample.png diff --git a/examples/tools/doc/plugandpaint-plugindialog.png b/examples/widgets/doc/images/plugandpaint-plugindialog.png similarity index 100% rename from examples/tools/doc/plugandpaint-plugindialog.png rename to examples/widgets/doc/images/plugandpaint-plugindialog.png diff --git a/examples/tools/doc/plugandpaint.png b/examples/widgets/doc/images/plugandpaint.png similarity index 100% rename from examples/tools/doc/plugandpaint.png rename to examples/widgets/doc/images/plugandpaint.png diff --git a/examples/tools/doc/regexp-example.png b/examples/widgets/doc/images/regexp-example.png similarity index 100% rename from examples/tools/doc/regexp-example.png rename to examples/widgets/doc/images/regexp-example.png diff --git a/examples/tools/doc/settingseditor-example.png b/examples/widgets/doc/images/settingseditor-example.png similarity index 100% rename from examples/tools/doc/settingseditor-example.png rename to examples/widgets/doc/images/settingseditor-example.png diff --git a/examples/tools/doc/stylepluginexample.png b/examples/widgets/doc/images/stylepluginexample.png similarity index 100% rename from examples/tools/doc/stylepluginexample.png rename to examples/widgets/doc/images/stylepluginexample.png diff --git a/examples/tools/doc/textfinder-example-userinterface.png b/examples/widgets/doc/images/textfinder-example-userinterface.png similarity index 100% rename from examples/tools/doc/textfinder-example-userinterface.png rename to examples/widgets/doc/images/textfinder-example-userinterface.png diff --git a/examples/tools/doc/treemodelcompleter-example.png b/examples/widgets/doc/images/treemodelcompleter-example.png similarity index 100% rename from examples/tools/doc/treemodelcompleter-example.png rename to examples/widgets/doc/images/treemodelcompleter-example.png diff --git a/examples/tools/doc/undodemo.png b/examples/widgets/doc/images/undodemo.png similarity index 100% rename from examples/tools/doc/undodemo.png rename to examples/widgets/doc/images/undodemo.png diff --git a/examples/tools/doc/undoframeworkexample.png b/examples/widgets/doc/images/undoframeworkexample.png similarity index 100% rename from examples/tools/doc/undoframeworkexample.png rename to examples/widgets/doc/images/undoframeworkexample.png diff --git a/examples/tools/doc/completer.qdoc b/examples/widgets/doc/src/completer.qdoc similarity index 88% rename from examples/tools/doc/completer.qdoc rename to examples/widgets/doc/src/completer.qdoc index d8a82b6aee..39be735245 100644 --- a/examples/tools/doc/completer.qdoc +++ b/examples/widgets/doc/src/completer.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example completer + \example tools/completer \title Completer Example The Completer example shows how to provide string-completion facilities @@ -45,14 +45,14 @@ \e{countries.txt} and \e{words.txt}. The resource file contains the following code: - \quotefile completer/completer.qrc + \quotefile tools/completer/completer.qrc \section1 FileSystemModel Class Definition The \c FileSystemModel class is a subclass of QFileSystemModel, which provides a data model for the local filesystem. - \snippet completer/fsmodel.h 0 + \snippet tools/completer/fsmodel.h 0 This class only has a constructor and a \c data() function as it is only created to enable \c data() to return the entire file path for the @@ -65,14 +65,14 @@ The constructor for the \c FileSystemModel class is used to pass \a parent to QFileSystemModel. - \snippet completer/fsmodel.cpp 0 + \snippet tools/completer/fsmodel.cpp 0 As mentioned earlier, the \c data() function is reimplemented in order to get it to return the entire file parth for the display role. For example, with a QFileSystemModel, you will see "Program Files" in the view. However, with \c FileSystemModel, you will see "C:\\Program Files". - \snippet completer/fsmodel.cpp 1 + \snippet tools/completer/fsmodel.cpp 1 The screenshots below illustrate this difference: @@ -90,14 +90,14 @@ private slots - \c about(), \c changeCase(), \c changeMode(), \c changeModel(), and \c changeMaxVisible(). - \snippet completer/mainwindow.h 0 + \snippet tools/completer/mainwindow.h 0 Within the \c MainWindow class, we have two private functions: \c createMenu() and \c modelFromFile(). We also declare the private widgets needed - three QComboBox objects, a QCheckBox, a QCompleter, a QLabel, and a QLineEdit. - \snippet completer/mainwindow.h 1 + \snippet tools/completer/mainwindow.h 1 \section1 MainWindow Class Implementation @@ -110,7 +110,7 @@ the \c modeCombo is set to "Filtered Popup" and the \c caseCombo is set to "Case Insensitive". - \snippet completer/mainwindow.cpp 0 + \snippet tools/completer/mainwindow.cpp 0 The \c maxVisibleSpinBox is created and determines the number of visible item in the completer @@ -119,26 +119,26 @@ \c{completer}'s \l{QCompleter::setWrapAround()}{setWrapAround()} property is enabled or disabled. - \snippet completer/mainwindow.cpp 1 + \snippet tools/completer/mainwindow.cpp 1 We instantiate \c contentsLabel and set its size policy to \l{QSizePolicy::Fixed}{fixed}. The combo boxes' \l{QComboBox::activated()} {activated()} signals are then connected to their respective slots. - \snippet completer/mainwindow.cpp 2 + \snippet tools/completer/mainwindow.cpp 2 The \c lineEdit is set up and then we arrange all the widgets using a QGridLayout. The \c changeModel() function is called, to initialize the \c completer. - \snippet completer/mainwindow.cpp 3 + \snippet tools/completer/mainwindow.cpp 3 The \c createMenu() function is used to instantiate the QAction objects needed to fill the \c fileMenu and \c helpMenu. The actions' \l{QAction::triggered()}{triggered()} signals are connected to their respective slots. - \snippet completer/mainwindow.cpp 4 + \snippet tools/completer/mainwindow.cpp 4 The \c modelFromFile() function accepts the \a fileName of a file and processes it depending on its contents. @@ -147,26 +147,26 @@ QFile::ReadOnly mode. If this is unsuccessful, the function returns an empty QStringListModel. - \snippet completer/mainwindow.cpp 5 + \snippet tools/completer/mainwindow.cpp 5 The mouse cursor is then overridden with Qt::WaitCursor before we fill a QStringList object, \c words, with the contents of \c file. Once this is done, we restore the mouse cursor. - \snippet completer/mainwindow.cpp 6 + \snippet tools/completer/mainwindow.cpp 6 As mentioned earlier, the resources file contains two files - \e{countries.txt} and \e{words.txt}. If the \c file read is \e{words.txt}, we return a QStringListModel with \c words as its QStringList and \c completer as its parent. - \snippet completer/mainwindow.cpp 7 + \snippet tools/completer/mainwindow.cpp 7 If the \c file read is \e{countries.txt}, then we require a QStandardItemModel with \c words.count() rows, 2 columns, and \c completer as its parent. - \snippet completer/mainwindow.cpp 8 + \snippet tools/completer/mainwindow.cpp 8 A standard line in \e{countries.txt} is: \quotation @@ -177,12 +177,12 @@ split the country name and its symbol. Once this is done, we return \c m. - \snippet completer/mainwindow.cpp 9 + \snippet tools/completer/mainwindow.cpp 9 The \c changeMode() function sets the \c{completer}'s mode, depending on the value of \c index. - \snippet completer/mainwindow.cpp 10 + \snippet tools/completer/mainwindow.cpp 10 The \c changeModel() function changes the item model used based on the model selected by the user. @@ -191,7 +191,7 @@ of \c modelCombo. If \c case is 0, we use an unsorted QFileSystemModel, providing us with a file path excluding the drive label. - \snippet completer/mainwindow.cpp 11 + \snippet tools/completer/mainwindow.cpp 11 Note that we create the model with \c completer as the parent as this allows us to replace the model with a new model. The \c completer will @@ -201,14 +201,14 @@ If \c case is 1, we use the \c DirModel we defined earlier, resulting in full paths for the files. - \snippet completer/mainwindow.cpp 12 + \snippet tools/completer/mainwindow.cpp 12 When \c case is 2, we attempt to complete names of countries. This requires a QTreeView object, \c treeView. The country names are extracted from \e{countries.txt} and set the popup used to display completions to \c treeView. - \snippet completer/mainwindow.cpp 13 + \snippet tools/completer/mainwindow.cpp 13 The screenshot below shows the Completer with the country list model. @@ -229,21 +229,21 @@ to the \c{completer}'s \l{QCompleter::setWrapAround()}{setWrapAround()} slot. - \snippet completer/mainwindow.cpp 14 + \snippet tools/completer/mainwindow.cpp 14 The \c changeMaxVisible() update the maximum number of visible items in the completer. - \snippet completer/mainwindow.cpp 15 + \snippet tools/completer/mainwindow.cpp 15 The \c about() function provides a brief description about the example. - \snippet completer/mainwindow.cpp 16 + \snippet tools/completer/mainwindow.cpp 16 \section1 \c main() Function The \c main() function instantiates QApplication and \c MainWindow and invokes the \l{QWidget::show()}{show()} function. - \snippet completer/main.cpp 0 + \snippet tools/completer/main.cpp 0 */ diff --git a/examples/tools/doc/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc similarity index 91% rename from examples/tools/doc/echoplugin.qdoc rename to examples/widgets/doc/src/echoplugin.qdoc index 5950083b2a..81ba18cdff 100644 --- a/examples/tools/doc/echoplugin.qdoc +++ b/examples/widgets/doc/src/echoplugin.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example echoplugin + \example tools/echoplugin \title Echo Plugin Example This example shows how to create a Qt plugin. @@ -64,7 +64,7 @@ The \c EchoWindow class lets us test the \c EchoPlugin through a GUI. - \snippet echoplugin/echowindow/echowindow.h 0 + \snippet tools/echoplugin/echowindow/echowindow.h 0 We load the plugin in \c loadPlugin() and cast it to \c EchoInterface. When the user clicks the \c button we take the @@ -75,7 +75,7 @@ We start with a look at the constructor: - \snippet echoplugin/echowindow/echowindow.cpp 0 + \snippet tools/echoplugin/echowindow/echowindow.cpp 0 We create the widgets and set a title for the window. We then load the plugin. \c loadPlugin() returns false if the plugin could not @@ -86,7 +86,7 @@ Here is the implementation of \c sendEcho(): - \snippet echoplugin/echowindow/echowindow.cpp 1 + \snippet tools/echoplugin/echowindow/echowindow.cpp 1 This slot is called when the user pushes \c button or presses enter in \c lineEdit. We call \c echo() of the echo interface. In @@ -96,14 +96,14 @@ Here is the implementation of \c createGUI(): - \snippet echoplugin/echowindow/echowindow.cpp 2 + \snippet tools/echoplugin/echowindow/echowindow.cpp 2 We create the widgets and lay them out in a grid layout. We connect the label and line edit to our \c sendEcho() slot. Here is the \c loadPlugin() function: - \snippet echoplugin/echowindow/echowindow.cpp 3 + \snippet tools/echoplugin/echowindow/echowindow.cpp 3 Access to plugins at run-time is provided by QPluginLoader. You supply it with the filename of the shared library the plugin is @@ -126,7 +126,7 @@ virtual functions. If non virtual functions were present in the class you would get misleading compile errors in the moc files. - \snippet echoplugin/echowindow/echointerface.h 0 + \snippet tools/echoplugin/echowindow/echointerface.h 0 We declare \c echo(). In our \c EchoPlugin we use this method to return, or echo, \a message. @@ -146,18 +146,18 @@ If a class implements more than one interface, they are given as a comma separated list. - \snippet echoplugin/plugin/echoplugin.h 0 + \snippet tools/echoplugin/plugin/echoplugin.h 0 \section1 EchoPlugin Class Implementation Here is the implementation of \c echo(): - \snippet echoplugin/plugin/echoplugin.cpp 0 + \snippet tools/echoplugin/plugin/echoplugin.cpp 0 We simply return the functions parameter. - \snippet echoplugin/plugin/echoplugin.cpp 1 + \snippet tools/echoplugin/plugin/echoplugin.cpp 1 We use the Q_EXPORT_PLUGIN2 macro to let Qt know that the \c EchoPlugin class is a plugin. The first parameter is the name of @@ -166,7 +166,7 @@ \section1 The \c main() function - \snippet echoplugin/echowindow/main.cpp 0 + \snippet tools/echoplugin/echowindow/main.cpp 0 We create an \c EchoWindow and display it as a top-level window. @@ -179,12 +179,12 @@ template and simply includes includes to directories in which the echo window and echo plugin lives: - \snippet echoplugin/echoplugin.pro 0 + \snippet tools/echoplugin/echoplugin.pro 0 The profile for the echo window does not need any plugin specific settings. We move on to the plugin profile: - \snippet echoplugin/plugin/plugin.pro 0 + \snippet tools/echoplugin/plugin/plugin.pro 0 We need to set the TEMPLATE as we now want to make a library instead of an executable. We also need to tell qmake that we are diff --git a/examples/tools/doc/i18n.qdoc b/examples/widgets/doc/src/i18n.qdoc similarity index 98% rename from examples/tools/doc/i18n.qdoc rename to examples/widgets/doc/src/i18n.qdoc index da6b9703b9..980319233d 100644 --- a/examples/tools/doc/i18n.qdoc +++ b/examples/widgets/doc/src/i18n.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example i18n + \example tools/i18n \title I18N Example The Internationalization (I18N) example demonstrates Qt's support for translated diff --git a/examples/tools/doc/plugandpaint.qdoc b/examples/widgets/doc/src/plugandpaint.qdoc similarity index 90% rename from examples/tools/doc/plugandpaint.qdoc rename to examples/widgets/doc/src/plugandpaint.qdoc index 31007314c5..24fb4ab1b9 100644 --- a/examples/tools/doc/plugandpaint.qdoc +++ b/examples/widgets/doc/src/plugandpaint.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example plugandpaint + \example tools/plugandpaint \title Plug & Paint Example The Plug & Paint example demonstrates how to write Qt @@ -74,7 +74,7 @@ in the plugins. - \snippet plugandpaint/interfaces.h 0 + \snippet tools/plugandpaint/interfaces.h 0 The \c BrushInterface class declares four pure virtual functions. The first pure virtual function, \c brushes(), returns a list of @@ -96,7 +96,7 @@ virtual destructor. We provide the destructor to keep these compilers happy. - \snippet plugandpaint/interfaces.h 1 + \snippet tools/plugandpaint/interfaces.h 1 The \c ShapeInterface class declares a \c shapes() function that works the same as \c{BrushInterface}'s \c brushes() function, and @@ -106,13 +106,13 @@ parent parameter can be used by the plugin to pop up a dialog asking the user to specify more information. - \snippet plugandpaint/interfaces.h 2 + \snippet tools/plugandpaint/interfaces.h 2 The \c FilterInterface class declares a \c filters() function that returns a list of filter names, and a \c filterImage() function that applies a filter to an image. - \snippet plugandpaint/interfaces.h 4 + \snippet tools/plugandpaint/interfaces.h 4 To make it possible to query at run-time whether a plugin implements a given interface, we must use the \c @@ -144,7 +144,7 @@ \l{mainwindows/application}{Application}). Here, we'll concentrate on the parts of the code that are related to plugins. - \snippet plugandpaint/mainwindow.cpp 4 + \snippet tools/plugandpaint/mainwindow.cpp 4 The \c loadPlugins() function is called from the \c MainWindow constructor to detect plugins and update the \uicontrol{Brush}, @@ -155,7 +155,7 @@ QObject. That QObject implements plugin interfaces using multiple inheritance. - \snippet plugandpaint/mainwindow.cpp 5 + \snippet tools/plugandpaint/mainwindow.cpp 5 The next step is to load dynamic plugins. We initialize the \c pluginsDir member variable to refer to the \c plugins @@ -166,9 +166,9 @@ this file is usually located in a subdirectory, so we need to take this into account. - \snippet plugandpaint/mainwindow.cpp 6 - \snippet plugandpaint/mainwindow.cpp 7 - \snippet plugandpaint/mainwindow.cpp 8 + \snippet tools/plugandpaint/mainwindow.cpp 6 + \snippet tools/plugandpaint/mainwindow.cpp 7 + \snippet tools/plugandpaint/mainwindow.cpp 8 We use QDir::entryList() to get a list of all files in that directory. Then we iterate over the result using \l foreach and @@ -181,12 +181,12 @@ If QPluginLoader::instance() is non-null, we add it to the menus. - \snippet plugandpaint/mainwindow.cpp 9 + \snippet tools/plugandpaint/mainwindow.cpp 9 At the end, we enable or disable the \uicontrol{Brush}, \uicontrol{Shapes}, and \uicontrol{Filters} menus based on whether they contain any items. - \snippet plugandpaint/mainwindow.cpp 10 + \snippet tools/plugandpaint/mainwindow.cpp 10 For each plugin (static or dynamic), we check which interfaces it implements using \l qobject_cast(). First, we try to cast the @@ -195,7 +195,7 @@ by \c brushes(). Then we do the same with the \c ShapeInterface and the \c FilterInterface. - \snippet plugandpaint/mainwindow.cpp 3 + \snippet tools/plugandpaint/mainwindow.cpp 3 The \c aboutPlugins() slot is called on startup and can be invoked at any time through the \uicontrol{About Plugins} action. It @@ -211,7 +211,7 @@ plugin from which it comes from as the parent; this makes it convenient to get access to the plugin later. - \snippet plugandpaint/mainwindow.cpp 0 + \snippet tools/plugandpaint/mainwindow.cpp 0 The \c changeBrush() slot is invoked when the user chooses one of the brushes from the \uicontrol{Brush} menu. We start by finding out @@ -222,7 +222,7 @@ identifying the brush. Next time the user draws on the paint area, \c PaintArea will use this brush. - \snippet plugandpaint/mainwindow.cpp 1 + \snippet tools/plugandpaint/mainwindow.cpp 1 The \c insertShape() is invoked when the use chooses one of the shapes from the \uicontrol{Shapes} menu. We retrieve the QAction that @@ -230,7 +230,7 @@ QAction, and finally we call \c ShapeInterface::generateShape() to obtain a QPainterPath. - \snippet plugandpaint/mainwindow.cpp 2 + \snippet tools/plugandpaint/mainwindow.cpp 2 The \c applyFilter() slot is similar: We retrieve the QAction that invoked the slot, then the \c FilterInterface associated to @@ -243,12 +243,12 @@ The \c PaintArea class contains some code that deals with \c BrushInterface, so we'll review it briefly. - \snippet plugandpaint/paintarea.cpp 0 + \snippet tools/plugandpaint/paintarea.cpp 0 In \c setBrush(), we simply store the \c BrushInterface and the brush that are given to us by \c MainWindow. - \snippet plugandpaint/paintarea.cpp 1 + \snippet tools/plugandpaint/paintarea.cpp 1 In the \l{QWidget::mouseMoveEvent()}{mouse move event handler}, we call the \c BrushInterface::mouseMove() function on the @@ -262,7 +262,7 @@ and a list of plugin file names. It calls \c findPlugins() to fill the QTreeWdiget with information about the plugins: - \snippet plugandpaint/plugindialog.cpp 0 + \snippet tools/plugandpaint/plugindialog.cpp 0 The \c findPlugins() is very similar to \c MainWindow::loadPlugins(). It uses QPluginLoader to access the @@ -270,7 +270,7 @@ populateTreeWidget() uses \l qobject_cast() to find out which interfaces are implemented by the plugins: - \snippet plugandpaint/plugindialog.cpp 1 + \snippet tools/plugandpaint/plugindialog.cpp 1 \section1 Importing Static Plugins @@ -283,7 +283,7 @@ For Plug & Paint, we have chosen to put Q_IMPORT_PLUGIN() in \c main.cpp: - \snippet plugandpaint/main.cpp 0 + \snippet tools/plugandpaint/main.cpp 0 The argument to Q_IMPORT_PLUGIN() is the plugin's name, as specified with Q_EXPORT_PLUGIN2() in the \l{Exporting the @@ -292,7 +292,7 @@ In the \c .pro file, we need to specify the static library. Here's the project file for building Plug & Paint: - \snippet plugandpaint/plugandpaint.pro 0 + \snippet tools/plugandpaint/plugandpaint.pro 0 The \c LIBS line variable specifies the library \c pnp_basictools located in the \c ../plugandpaintplugins/basictools directory. @@ -311,7 +311,7 @@ */ /*! - \example plugandpaintplugins/basictools + \example tools/plugandpaintplugins/basictools \title Plug & Paint Basic Tools Example The Basic Tools example is a static plugin for the @@ -329,7 +329,7 @@ \section1 Declaration of the Plugin Class - \snippet plugandpaintplugins/basicbasictoolsplugin.h 0 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.h 0 We start by including \c interfaces.h, which defines the plugin interfaces for the \l{plugandpaint}{Plug & Paint} @@ -346,7 +346,7 @@ \l qobject_cast() in the \l{plugandpaint}{Plug & Paint} application to detect interfaces. - \snippet plugandpaintplugins/basicbasictoolsplugin.h 2 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.h 2 In the \c public section of the class, we declare all the functions from the three interfaces. @@ -356,23 +356,23 @@ Let's now review the implementation of the \c BasicToolsPlugin member functions inherited from \c BrushInterface. - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 0 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 0 The \c brushes() function returns a list of brushes provided by this plugin. We provide three brushes: \uicontrol{Pencil}, \uicontrol{Air Brush}, and \uicontrol{Random Letters}. - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 1 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 1 On a mouse press event, we just call \c mouseMove() to draw the spot where the event occurred. - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 2 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 2 In \c mouseMove(), we start by saving the state of the QPainter and we compute a few variables that we'll need later. - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 3 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 3 Then comes the brush-dependent part of the code: @@ -394,14 +394,14 @@ At the end, we restore the painter state to what it was upon entering the function and we return the bounding rectangle. - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 4 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 4 When the user releases the mouse, we do nothing and return an empty QRect. \section1 Implementation of the Shape Interface - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 5 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 5 The plugin provides three shapes: \uicontrol{Circle}, \uicontrol{Star}, and \uicontrol{Text...}. The three dots after \uicontrol{Text} are there because @@ -413,7 +413,7 @@ distinguish between the internal shape name and the name used in the user interface. - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 6 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 6 The \c generateShape() creates a QPainterPath for the specified shape. If the shape is \uicontrol{Text}, we pop up a QInputDialog to @@ -421,12 +421,12 @@ \section1 Implementation of the Filter Interface - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 7 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 7 The plugin provides three filters: \uicontrol{Invert Pixels}, \uicontrol{Swap RGB}, and \uicontrol{Grayscale}. - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 8 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 8 The \c filterImage() function takes a filter name and a QImage as parameters and returns an altered QImage. The first thing we do @@ -444,7 +444,7 @@ Q_EXPORT_PLUGIN2() macro to specify which class provides the plugin: - \snippet plugandpaintplugins/basicbasictoolsplugin.cpp 9 + \snippet tools/plugandpaintplugins/basictools/basictoolsplugin.cpp 9 This line may appear in any \c .cpp file that is part of the plugin's source code. @@ -453,7 +453,7 @@ Here's the project file for building the Basic Tools plugin: - \snippet plugandpaintplugins/basicbasictools.pro 0 + \snippet tools/plugandpaintplugins/basictools/basictools.pro 0 The \c .pro file differs from typical \c .pro files in many respects. First, it starts with a \c TEMPLATE entry specifying \c @@ -489,7 +489,7 @@ */ /*! - \example plugandpaintplugins/extrafilters + \example tools/plugandpaintplugins/extrafilters \title Plug & Paint Extra Filters Example The Extra Filters example is a plugin for the @@ -506,7 +506,7 @@ Here's the project file for building the Extra Filters plugin: - \snippet plugandpaintplugins/extrafilters/extrafilters.pro 0 + \snippet tools/plugandpaintplugins/extrafilters/extrafilters.pro 0 The \c .pro file differs from typical \c .pro files in many respects. First, it starts with a \c TEMPLATE entry specifying \c diff --git a/examples/tools/doc/regexp.qdoc b/examples/widgets/doc/src/regexp.qdoc similarity index 98% rename from examples/tools/doc/regexp.qdoc rename to examples/widgets/doc/src/regexp.qdoc index f90e6a899d..a2c7b53ed2 100644 --- a/examples/tools/doc/regexp.qdoc +++ b/examples/widgets/doc/src/regexp.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example regexp + \example tools/regexp \title Regular Expressions Example The Regular Expressions (RegExp) example shows how regular expressions in Qt are diff --git a/examples/tools/doc/settingseditor.qdoc b/examples/widgets/doc/src/settingseditor.qdoc similarity index 97% rename from examples/tools/doc/settingseditor.qdoc rename to examples/widgets/doc/src/settingseditor.qdoc index d4985f226b..6d295bb928 100644 --- a/examples/tools/doc/settingseditor.qdoc +++ b/examples/widgets/doc/src/settingseditor.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example settingseditor + \example tools/settingseditor \title Settings Editor Example The Settings Editor example shows how Qt's standard settings support is used in an diff --git a/examples/tools/doc/styleplugin.qdoc b/examples/widgets/doc/src/styleplugin.qdoc similarity index 94% rename from examples/tools/doc/styleplugin.qdoc rename to examples/widgets/doc/src/styleplugin.qdoc index 088c660727..42f35f2141 100644 --- a/examples/tools/doc/styleplugin.qdoc +++ b/examples/widgets/doc/src/styleplugin.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example styleplugin + \example tools/styleplugin \title Style Plugin Example This example shows how to create a plugin that extends Qt with a new @@ -73,7 +73,7 @@ \c SimpleStylePlugin inherits QStylePlugin and is the plugin class. - \snippet styleplugin/plugin/simplestyleplugin.h 0 + \snippet tools/styleplugin/plugin/simplestyleplugin.h 0 \c keys() returns a list of style names that this plugin can create, while \c create() takes such a string and returns the @@ -87,14 +87,14 @@ Here is the implementation of \c keys(): - \snippet styleplugin/plugin/simplestyleplugin.cpp 0 + \snippet tools/styleplugin/plugin/simplestyleplugin.cpp 0 Since this plugin only supports one style, we return a QStringList with the class name of that style. Here is the \c create() function: - \snippet styleplugin/plugin/simplestyleplugin.cpp 1 + \snippet tools/styleplugin/plugin/simplestyleplugin.cpp 1 Note that the key for style plugins are case insensitive. The case sensitivity varies from plugin to plugin, so you need to @@ -102,7 +102,7 @@ \section1 The \c main() function - \snippet styleplugin/stylewindow/main.cpp 0 + \snippet tools/styleplugin/stylewindow/main.cpp 0 Qt loads the available style plugins when the QApplication object is initialized. The QStyleFactory class knows about all styles and @@ -114,7 +114,7 @@ The \c SimpleStylePlugin lives in its own directory and have its own profile: - \snippet styleplugin/plugin/plugin.pro 0 + \snippet tools/styleplugin/plugin/plugin.pro 0 In the plugin profile we need to set the lib template as we are building a shared library instead of an executable. We must also diff --git a/examples/tools/doc/treemodelcompleter.qdoc b/examples/widgets/doc/src/treemodelcompleter.qdoc similarity index 85% rename from examples/tools/doc/treemodelcompleter.qdoc rename to examples/widgets/doc/src/treemodelcompleter.qdoc index b4491f6104..c6b7768976 100644 --- a/examples/tools/doc/treemodelcompleter.qdoc +++ b/examples/widgets/doc/src/treemodelcompleter.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example treemodelcompleter + \example tools/treemodelcompleter \title Tree Model Completer Example The Tree Model Completer example shows how to provide completion @@ -45,7 +45,7 @@ This file is embedded within the \e treemodelcompleter.qrc resource file, which contains the following: - \quotefile treemodelcompleter/treemodelcompleter.qrc + \quotefile tools/treemodelcompleter/treemodelcompleter.qrc \section1 TreeModelCompleter Class Definition @@ -53,7 +53,7 @@ constructors - one with \a parent as an argument and another with \a parent and \a model as arguments. - \snippet treemodelcompleter/treemodelcompleter.h 0 + \snippet tools/treemodelcompleter/treemodelcompleter.h 0 The class reimplements the protected functions \l{QCompleter::splitPath()}{splitPath()} and @@ -72,14 +72,14 @@ parent while the second constructor constructs an object with a parent and a QAbstractItemModel, \a model. - \snippet treemodelcompleter/treemodelcompleter.cpp 0 + \snippet tools/treemodelcompleter/treemodelcompleter.cpp 0 \codeline - \snippet treemodelcompleter/treemodelcompleter.cpp 1 + \snippet tools/treemodelcompleter/treemodelcompleter.cpp 1 The \c separator() function is a getter function that returns the separator string. - \snippet treemodelcompleter/treemodelcompleter.cpp 2 + \snippet tools/treemodelcompleter/treemodelcompleter.cpp 2 As mentioned earlier, the \c splitPath() function is reimplemented because the default implementation is more suited to QDirModel or list models. In @@ -87,7 +87,7 @@ matched at each level, we split it using QString::split() with \c sep as its separator. - \snippet treemodelcompleter/treemodelcompleter.cpp 3 + \snippet tools/treemodelcompleter/treemodelcompleter.cpp 3 The \c pathFromIndex() function returns data for the completionRole() for a tree model. This function is reimplemented as its default implementation is @@ -97,7 +97,7 @@ accumulate the data. The function then returns a QStringList, \c dataList, using a separator to join objects of different levels. - \snippet treemodelcompleter/treemodelcompleter.cpp 4 + \snippet tools/treemodelcompleter/treemodelcompleter.cpp 4 \section1 MainWindow Class Definition @@ -105,13 +105,13 @@ custom slots: \c about(), \c changeCase(), \c changeMode(), \c highlight(), and \c updateContentsLabel(). - \snippet treemodelcompleter/mainwindow.h 0 + \snippet tools/treemodelcompleter/mainwindow.h 0 In addition, the class has two private functions, \c createMenu() and \c modelFromFile(), as well as private instances of QTreeView, QComboBox, QLabel, \c TreeModelCompleter and QLineEdit. - \snippet treemodelcompleter/mainwindow.h 1 + \snippet tools/treemodelcompleter/mainwindow.h 1 \section1 MainWindow Class Implementation @@ -123,49 +123,49 @@ {highlighted()} signal is connected to \c{MainWindow}'s \c highlight() slot. - \snippet treemodelcompleter/mainwindow.cpp 0 + \snippet tools/treemodelcompleter/mainwindow.cpp 0 The QLabel objects \c modelLabel, \c modeLabel and \c caseLabel are instantiated. Also, the QComboBox objects, \c modeCombo and \c caseCombo, are instantiated and populated. By default, the \c{completer}'s mode is "Filtered Popup" and the case is insensitive. - \snippet treemodelcompleter/mainwindow.cpp 1 + \snippet tools/treemodelcompleter/mainwindow.cpp 1 \codeline - \snippet treemodelcompleter/mainwindow.cpp 2 + \snippet tools/treemodelcompleter/mainwindow.cpp 2 We use a QGridLayout to place all the objects in the \c MainWindow. - \snippet treemodelcompleter/mainwindow.cpp 3 + \snippet tools/treemodelcompleter/mainwindow.cpp 3 The \c createMenu() function sets up the QAction objects required and adds them to the "File" menu and "Help" menu. The \l{QAction::triggered()}{triggered()} signals from these actions are connected to their respective slots. - \snippet treemodelcompleter/mainwindow.cpp 4 + \snippet tools/treemodelcompleter/mainwindow.cpp 4 The \c changeMode() function accepts an \a index corresponding to the user's choice of completion mode and changes the \c{completer}'s mode accordingly. - \snippet treemodelcompleter/mainwindow.cpp 5 + \snippet tools/treemodelcompleter/mainwindow.cpp 5 The \c about() function provides a brief description on the Tree Model Completer example. - \snippet treemodelcompleter/mainwindow.cpp 6 + \snippet tools/treemodelcompleter/mainwindow.cpp 6 The \c changeCase() function alternates between \l{Qt::CaseSensitive} {Case Sensitive} and \l{Qt::CaseInsensitive}{Case Insensitive} modes, depending on the value of \a cs. - \snippet treemodelcompleter/mainwindow.cpp 7 + \snippet tools/treemodelcompleter/mainwindow.cpp 7 \section1 \c main() Function The \c main() function instantiates \c MainWindow and invokes the \l{QWidget::show()}{show()} function to display it. - \snippet treemodelcompleter/main.cpp 0 + \snippet tools/treemodelcompleter/main.cpp 0 */ diff --git a/examples/tools/doc/undo.qdoc b/examples/widgets/doc/src/undo.qdoc similarity index 98% rename from examples/tools/doc/undo.qdoc rename to examples/widgets/doc/src/undo.qdoc index 545a23c520..03920e44dd 100644 --- a/examples/tools/doc/undo.qdoc +++ b/examples/widgets/doc/src/undo.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example undo + \example tools/undo \title Undo Framework This example shows Qt's undo framework in action. diff --git a/examples/tools/doc/undoframework.qdoc b/examples/widgets/doc/src/undoframework.qdoc similarity index 85% rename from examples/tools/doc/undoframework.qdoc rename to examples/widgets/doc/src/undoframework.qdoc index 0a798be5a7..849b2e6143 100644 --- a/examples/tools/doc/undoframework.qdoc +++ b/examples/widgets/doc/src/undoframework.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example undoframework + \example tools/undoframework \title Undo Framework Example This example shows how to implement undo/redo functionality @@ -78,7 +78,7 @@ \section1 MainWindow Class Definition - \snippet undoframework/mainwindow.h 0 + \snippet tools/undoframework/mainwindow.h 0 The \c MainWindow class maintains the undo stack, i.e., it creates \l{QUndoCommand}s and pushes and pops them from the stack when it @@ -89,13 +89,13 @@ We will start with a look at the constructor: - \snippet undoframework/mainwindow.cpp 0 + \snippet tools/undoframework/mainwindow.cpp 0 In the constructor, we set up the DiagramScene and QGraphicsView. Here is the \c createUndoView() function: - \snippet undoframework/mainwindow.cpp 1 + \snippet tools/undoframework/mainwindow.cpp 1 The QUndoView is a widget that display the text, which is set with the \l{QUndoCommand::}{setText()} function, for each QUndoCommand @@ -103,11 +103,11 @@ Here is the \c createActions() function: - \snippet undoframework/mainwindow.cpp 2 + \snippet tools/undoframework/mainwindow.cpp 2 \codeline - \snippet undoframework/mainwindow.cpp 3 + \snippet tools/undoframework/mainwindow.cpp 3 \dots - \snippet undoframework/mainwindow.cpp 5 + \snippet tools/undoframework/mainwindow.cpp 5 The \c createActions() function sets up all the examples actions in the manner shown above. The @@ -120,12 +120,12 @@ Here is the \c createMenus() function: - \snippet undoframework/mainwindow.cpp 6 + \snippet tools/undoframework/mainwindow.cpp 6 \dots - \snippet undoframework/mainwindow.cpp 7 + \snippet tools/undoframework/mainwindow.cpp 7 \dots - \snippet undoframework/mainwindow.cpp 8 + \snippet tools/undoframework/mainwindow.cpp 8 We have to use the QMenu \c aboutToShow() and \c aboutToHide() signals since we only want \c deleteAction to be enabled when we @@ -133,14 +133,14 @@ Here is the \c itemMoved() slot: - \snippet undoframework/mainwindow.cpp 9 + \snippet tools/undoframework/mainwindow.cpp 9 We simply push a MoveCommand on the stack, which calls \c redo() on it. Here is the \c deleteItem() slot: - \snippet undoframework/mainwindow.cpp 10 + \snippet tools/undoframework/mainwindow.cpp 10 An item must be selected to be deleted. We need to check if it is selected as the \c deleteAction may be enabled even if an item is @@ -149,9 +149,9 @@ Here is the \c itemMenuAboutToShow() and itemMenuAboutToHide() slots: - \snippet undoframework/mainwindow.cpp 11 + \snippet tools/undoframework/mainwindow.cpp 11 \codeline - \snippet undoframework/mainwindow.cpp 12 + \snippet tools/undoframework/mainwindow.cpp 12 We implement \c itemMenuAboutToShow() and \c itemMenuAboutToHide() to get a dynamic item menu. These slots are connected to the @@ -160,28 +160,28 @@ Here is the \c addBox() slot: - \snippet undoframework/mainwindow.cpp 13 + \snippet tools/undoframework/mainwindow.cpp 13 The \c addBox() function creates an AddCommand and pushes it on the undo stack. Here is the \c addTriangle() sot: - \snippet undoframework/mainwindow.cpp 14 + \snippet tools/undoframework/mainwindow.cpp 14 The \c addTriangle() function creates an AddCommand and pushes it on the undo stack. Here is the implementation of \c about(): - \snippet undoframework/mainwindow.cpp 15 + \snippet tools/undoframework/mainwindow.cpp 15 The about slot is triggered by the \c aboutAction and displays an about box for the example. \section1 AddCommand Class Definition - \snippet undoframework/commands.h 2 + \snippet tools/undoframework/commands.h 2 The \c AddCommand class adds DiagramItem graphics items to the DiagramScene. @@ -190,32 +190,32 @@ We start with the constructor: - \snippet undoframework/commands.cpp 7 + \snippet tools/undoframework/commands.cpp 7 We first create the DiagramItem to add to the DiagramScene. The \l{QUndoCommand::}{setText()} function let us set a QString that describes the command. We use this to get custom messages in the QUndoView and in the menu of the main window. - \snippet undoframework/commands.cpp 8 + \snippet tools/undoframework/commands.cpp 8 \c undo() removes the item from the scene. - \snippet undoframework/commands.cpp 9 + \snippet tools/undoframework/commands.cpp 9 We set the position of the item as we do not do this in the constructor. \section1 DeleteCommand Class Definition - \snippet undoframework/commands.h 1 + \snippet tools/undoframework/commands.h 1 The DeleteCommand class implements the functionality to remove an item from the scene. \section1 DeleteCommand Class Implementation - \snippet undoframework/commands.cpp 4 + \snippet tools/undoframework/commands.cpp 4 We know that there must be one selected item as it is not possible to create a DeleteCommand unless the item to be deleted is @@ -223,17 +223,17 @@ The item must be unselected if it is inserted back into the scene. - \snippet undoframework/commands.cpp 5 + \snippet tools/undoframework/commands.cpp 5 The item is simply reinserted into the scene. - \snippet undoframework/commands.cpp 6 + \snippet tools/undoframework/commands.cpp 6 The item is removed from the scene. \section1 MoveCommand Class Definition - \snippet undoframework/commands.h 0 + \snippet tools/undoframework/commands.h 0 The \l{QUndoCommand::}{mergeWith()} is reimplemented to make consecutive moves of an item one MoveCommand, i.e, the item will @@ -244,20 +244,20 @@ The constructor of MoveCommand looks like this: - \snippet undoframework/commands.cpp 0 + \snippet tools/undoframework/commands.cpp 0 We save both the old and new positions for undo and redo respectively. - \snippet undoframework/commands.cpp 2 + \snippet tools/undoframework/commands.cpp 2 We simply set the items old position and update the scene. - \snippet undoframework/commands.cpp 3 + \snippet tools/undoframework/commands.cpp 3 We set the item to its new position. - \snippet undoframework/commands.cpp 1 + \snippet tools/undoframework/commands.cpp 1 Whenever a MoveCommand is created, this function is called to check if it should be merged with the previous command. It is the @@ -271,7 +271,7 @@ \section1 DiagramScene Class Definition - \snippet undoframework/diagramscene.h 0 + \snippet tools/undoframework/diagramscene.h 0 The DiagramScene implements the functionality to move a DiagramItem with the mouse. It emits a signal when a move is @@ -283,7 +283,7 @@ The \c main() function of the program looks like this: - \snippet undoframework/main.cpp 0 + \snippet tools/undoframework/main.cpp 0 We draw a grid in the background of the DiagramScene, so we use a resource file. The rest of the function creates the \c MainWindow and diff --git a/examples/tools/codecs/codecs.desktop b/examples/widgets/tools/codecs/codecs.desktop similarity index 100% rename from examples/tools/codecs/codecs.desktop rename to examples/widgets/tools/codecs/codecs.desktop diff --git a/examples/tools/codecs/codecs.pro b/examples/widgets/tools/codecs/codecs.pro similarity index 100% rename from examples/tools/codecs/codecs.pro rename to examples/widgets/tools/codecs/codecs.pro diff --git a/examples/tools/codecs/encodedfiles/iso-8859-1.txt b/examples/widgets/tools/codecs/encodedfiles/iso-8859-1.txt similarity index 100% rename from examples/tools/codecs/encodedfiles/iso-8859-1.txt rename to examples/widgets/tools/codecs/encodedfiles/iso-8859-1.txt diff --git a/examples/tools/codecs/encodedfiles/iso-8859-15.txt b/examples/widgets/tools/codecs/encodedfiles/iso-8859-15.txt similarity index 100% rename from examples/tools/codecs/encodedfiles/iso-8859-15.txt rename to examples/widgets/tools/codecs/encodedfiles/iso-8859-15.txt diff --git a/examples/tools/codecs/encodedfiles/utf-16.txt b/examples/widgets/tools/codecs/encodedfiles/utf-16.txt similarity index 100% rename from examples/tools/codecs/encodedfiles/utf-16.txt rename to examples/widgets/tools/codecs/encodedfiles/utf-16.txt diff --git a/examples/tools/codecs/encodedfiles/utf-16be.txt b/examples/widgets/tools/codecs/encodedfiles/utf-16be.txt similarity index 100% rename from examples/tools/codecs/encodedfiles/utf-16be.txt rename to examples/widgets/tools/codecs/encodedfiles/utf-16be.txt diff --git a/examples/tools/codecs/encodedfiles/utf-16le.txt b/examples/widgets/tools/codecs/encodedfiles/utf-16le.txt similarity index 100% rename from examples/tools/codecs/encodedfiles/utf-16le.txt rename to examples/widgets/tools/codecs/encodedfiles/utf-16le.txt diff --git a/examples/tools/codecs/encodedfiles/utf-8.txt b/examples/widgets/tools/codecs/encodedfiles/utf-8.txt similarity index 100% rename from examples/tools/codecs/encodedfiles/utf-8.txt rename to examples/widgets/tools/codecs/encodedfiles/utf-8.txt diff --git a/examples/tools/codecs/main.cpp b/examples/widgets/tools/codecs/main.cpp similarity index 100% rename from examples/tools/codecs/main.cpp rename to examples/widgets/tools/codecs/main.cpp diff --git a/examples/tools/codecs/mainwindow.cpp b/examples/widgets/tools/codecs/mainwindow.cpp similarity index 100% rename from examples/tools/codecs/mainwindow.cpp rename to examples/widgets/tools/codecs/mainwindow.cpp diff --git a/examples/tools/codecs/mainwindow.h b/examples/widgets/tools/codecs/mainwindow.h similarity index 100% rename from examples/tools/codecs/mainwindow.h rename to examples/widgets/tools/codecs/mainwindow.h diff --git a/examples/tools/codecs/previewform.cpp b/examples/widgets/tools/codecs/previewform.cpp similarity index 100% rename from examples/tools/codecs/previewform.cpp rename to examples/widgets/tools/codecs/previewform.cpp diff --git a/examples/tools/codecs/previewform.h b/examples/widgets/tools/codecs/previewform.h similarity index 100% rename from examples/tools/codecs/previewform.h rename to examples/widgets/tools/codecs/previewform.h diff --git a/examples/tools/completer/completer.desktop b/examples/widgets/tools/completer/completer.desktop similarity index 100% rename from examples/tools/completer/completer.desktop rename to examples/widgets/tools/completer/completer.desktop diff --git a/examples/tools/completer/completer.pro b/examples/widgets/tools/completer/completer.pro similarity index 100% rename from examples/tools/completer/completer.pro rename to examples/widgets/tools/completer/completer.pro diff --git a/examples/tools/completer/completer.qrc b/examples/widgets/tools/completer/completer.qrc similarity index 100% rename from examples/tools/completer/completer.qrc rename to examples/widgets/tools/completer/completer.qrc diff --git a/examples/tools/completer/fsmodel.cpp b/examples/widgets/tools/completer/fsmodel.cpp similarity index 100% rename from examples/tools/completer/fsmodel.cpp rename to examples/widgets/tools/completer/fsmodel.cpp diff --git a/examples/tools/completer/fsmodel.h b/examples/widgets/tools/completer/fsmodel.h similarity index 100% rename from examples/tools/completer/fsmodel.h rename to examples/widgets/tools/completer/fsmodel.h diff --git a/examples/tools/completer/main.cpp b/examples/widgets/tools/completer/main.cpp similarity index 100% rename from examples/tools/completer/main.cpp rename to examples/widgets/tools/completer/main.cpp diff --git a/examples/tools/completer/mainwindow.cpp b/examples/widgets/tools/completer/mainwindow.cpp similarity index 100% rename from examples/tools/completer/mainwindow.cpp rename to examples/widgets/tools/completer/mainwindow.cpp diff --git a/examples/tools/completer/mainwindow.h b/examples/widgets/tools/completer/mainwindow.h similarity index 100% rename from examples/tools/completer/mainwindow.h rename to examples/widgets/tools/completer/mainwindow.h diff --git a/examples/tools/completer/resources/countries.txt b/examples/widgets/tools/completer/resources/countries.txt similarity index 100% rename from examples/tools/completer/resources/countries.txt rename to examples/widgets/tools/completer/resources/countries.txt diff --git a/examples/tools/completer/resources/wordlist.txt b/examples/widgets/tools/completer/resources/wordlist.txt similarity index 100% rename from examples/tools/completer/resources/wordlist.txt rename to examples/widgets/tools/completer/resources/wordlist.txt diff --git a/examples/tools/customcompleter/customcompleter.desktop b/examples/widgets/tools/customcompleter/customcompleter.desktop similarity index 100% rename from examples/tools/customcompleter/customcompleter.desktop rename to examples/widgets/tools/customcompleter/customcompleter.desktop diff --git a/examples/tools/customcompleter/customcompleter.pro b/examples/widgets/tools/customcompleter/customcompleter.pro similarity index 100% rename from examples/tools/customcompleter/customcompleter.pro rename to examples/widgets/tools/customcompleter/customcompleter.pro diff --git a/examples/tools/customcompleter/customcompleter.qrc b/examples/widgets/tools/customcompleter/customcompleter.qrc similarity index 100% rename from examples/tools/customcompleter/customcompleter.qrc rename to examples/widgets/tools/customcompleter/customcompleter.qrc diff --git a/examples/tools/customcompleter/main.cpp b/examples/widgets/tools/customcompleter/main.cpp similarity index 100% rename from examples/tools/customcompleter/main.cpp rename to examples/widgets/tools/customcompleter/main.cpp diff --git a/examples/tools/customcompleter/mainwindow.cpp b/examples/widgets/tools/customcompleter/mainwindow.cpp similarity index 100% rename from examples/tools/customcompleter/mainwindow.cpp rename to examples/widgets/tools/customcompleter/mainwindow.cpp diff --git a/examples/tools/customcompleter/mainwindow.h b/examples/widgets/tools/customcompleter/mainwindow.h similarity index 100% rename from examples/tools/customcompleter/mainwindow.h rename to examples/widgets/tools/customcompleter/mainwindow.h diff --git a/examples/tools/customcompleter/resources/wordlist.txt b/examples/widgets/tools/customcompleter/resources/wordlist.txt similarity index 100% rename from examples/tools/customcompleter/resources/wordlist.txt rename to examples/widgets/tools/customcompleter/resources/wordlist.txt diff --git a/examples/tools/customcompleter/textedit.cpp b/examples/widgets/tools/customcompleter/textedit.cpp similarity index 100% rename from examples/tools/customcompleter/textedit.cpp rename to examples/widgets/tools/customcompleter/textedit.cpp diff --git a/examples/tools/customcompleter/textedit.h b/examples/widgets/tools/customcompleter/textedit.h similarity index 100% rename from examples/tools/customcompleter/textedit.h rename to examples/widgets/tools/customcompleter/textedit.h diff --git a/examples/tools/echoplugin/echoplugin.pro b/examples/widgets/tools/echoplugin/echoplugin.pro similarity index 100% rename from examples/tools/echoplugin/echoplugin.pro rename to examples/widgets/tools/echoplugin/echoplugin.pro diff --git a/examples/tools/echoplugin/echowindow/echointerface.h b/examples/widgets/tools/echoplugin/echowindow/echointerface.h similarity index 100% rename from examples/tools/echoplugin/echowindow/echointerface.h rename to examples/widgets/tools/echoplugin/echowindow/echointerface.h diff --git a/examples/tools/echoplugin/echowindow/echowindow.cpp b/examples/widgets/tools/echoplugin/echowindow/echowindow.cpp similarity index 100% rename from examples/tools/echoplugin/echowindow/echowindow.cpp rename to examples/widgets/tools/echoplugin/echowindow/echowindow.cpp diff --git a/examples/tools/echoplugin/echowindow/echowindow.desktop b/examples/widgets/tools/echoplugin/echowindow/echowindow.desktop similarity index 100% rename from examples/tools/echoplugin/echowindow/echowindow.desktop rename to examples/widgets/tools/echoplugin/echowindow/echowindow.desktop diff --git a/examples/tools/echoplugin/echowindow/echowindow.h b/examples/widgets/tools/echoplugin/echowindow/echowindow.h similarity index 100% rename from examples/tools/echoplugin/echowindow/echowindow.h rename to examples/widgets/tools/echoplugin/echowindow/echowindow.h diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro similarity index 100% rename from examples/tools/echoplugin/echowindow/echowindow.pro rename to examples/widgets/tools/echoplugin/echowindow/echowindow.pro diff --git a/examples/tools/echoplugin/echowindow/main.cpp b/examples/widgets/tools/echoplugin/echowindow/main.cpp similarity index 100% rename from examples/tools/echoplugin/echowindow/main.cpp rename to examples/widgets/tools/echoplugin/echowindow/main.cpp diff --git a/examples/tools/echoplugin/plugin/echoplugin.cpp b/examples/widgets/tools/echoplugin/plugin/echoplugin.cpp similarity index 100% rename from examples/tools/echoplugin/plugin/echoplugin.cpp rename to examples/widgets/tools/echoplugin/plugin/echoplugin.cpp diff --git a/examples/tools/echoplugin/plugin/echoplugin.h b/examples/widgets/tools/echoplugin/plugin/echoplugin.h similarity index 100% rename from examples/tools/echoplugin/plugin/echoplugin.h rename to examples/widgets/tools/echoplugin/plugin/echoplugin.h diff --git a/examples/tools/echoplugin/plugin/echoplugin.json b/examples/widgets/tools/echoplugin/plugin/echoplugin.json similarity index 100% rename from examples/tools/echoplugin/plugin/echoplugin.json rename to examples/widgets/tools/echoplugin/plugin/echoplugin.json diff --git a/examples/tools/echoplugin/plugin/plugin.desktop b/examples/widgets/tools/echoplugin/plugin/plugin.desktop similarity index 100% rename from examples/tools/echoplugin/plugin/plugin.desktop rename to examples/widgets/tools/echoplugin/plugin/plugin.desktop diff --git a/examples/tools/echoplugin/plugin/plugin.pro b/examples/widgets/tools/echoplugin/plugin/plugin.pro similarity index 100% rename from examples/tools/echoplugin/plugin/plugin.pro rename to examples/widgets/tools/echoplugin/plugin/plugin.pro diff --git a/examples/tools/i18n/i18n.desktop b/examples/widgets/tools/i18n/i18n.desktop similarity index 100% rename from examples/tools/i18n/i18n.desktop rename to examples/widgets/tools/i18n/i18n.desktop diff --git a/examples/tools/i18n/i18n.pro b/examples/widgets/tools/i18n/i18n.pro similarity index 100% rename from examples/tools/i18n/i18n.pro rename to examples/widgets/tools/i18n/i18n.pro diff --git a/examples/tools/i18n/i18n.qrc b/examples/widgets/tools/i18n/i18n.qrc similarity index 100% rename from examples/tools/i18n/i18n.qrc rename to examples/widgets/tools/i18n/i18n.qrc diff --git a/examples/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp similarity index 100% rename from examples/tools/i18n/languagechooser.cpp rename to examples/widgets/tools/i18n/languagechooser.cpp diff --git a/examples/tools/i18n/languagechooser.h b/examples/widgets/tools/i18n/languagechooser.h similarity index 100% rename from examples/tools/i18n/languagechooser.h rename to examples/widgets/tools/i18n/languagechooser.h diff --git a/examples/tools/i18n/main.cpp b/examples/widgets/tools/i18n/main.cpp similarity index 100% rename from examples/tools/i18n/main.cpp rename to examples/widgets/tools/i18n/main.cpp diff --git a/examples/tools/i18n/mainwindow.cpp b/examples/widgets/tools/i18n/mainwindow.cpp similarity index 100% rename from examples/tools/i18n/mainwindow.cpp rename to examples/widgets/tools/i18n/mainwindow.cpp diff --git a/examples/tools/i18n/mainwindow.h b/examples/widgets/tools/i18n/mainwindow.h similarity index 100% rename from examples/tools/i18n/mainwindow.h rename to examples/widgets/tools/i18n/mainwindow.h diff --git a/examples/tools/i18n/translations/i18n_ar.qm b/examples/widgets/tools/i18n/translations/i18n_ar.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_ar.qm rename to examples/widgets/tools/i18n/translations/i18n_ar.qm diff --git a/examples/tools/i18n/translations/i18n_ar.ts b/examples/widgets/tools/i18n/translations/i18n_ar.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_ar.ts rename to examples/widgets/tools/i18n/translations/i18n_ar.ts diff --git a/examples/tools/i18n/translations/i18n_cs.qm b/examples/widgets/tools/i18n/translations/i18n_cs.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_cs.qm rename to examples/widgets/tools/i18n/translations/i18n_cs.qm diff --git a/examples/tools/i18n/translations/i18n_cs.ts b/examples/widgets/tools/i18n/translations/i18n_cs.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_cs.ts rename to examples/widgets/tools/i18n/translations/i18n_cs.ts diff --git a/examples/tools/i18n/translations/i18n_de.qm b/examples/widgets/tools/i18n/translations/i18n_de.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_de.qm rename to examples/widgets/tools/i18n/translations/i18n_de.qm diff --git a/examples/tools/i18n/translations/i18n_de.ts b/examples/widgets/tools/i18n/translations/i18n_de.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_de.ts rename to examples/widgets/tools/i18n/translations/i18n_de.ts diff --git a/examples/tools/i18n/translations/i18n_el.qm b/examples/widgets/tools/i18n/translations/i18n_el.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_el.qm rename to examples/widgets/tools/i18n/translations/i18n_el.qm diff --git a/examples/tools/i18n/translations/i18n_el.ts b/examples/widgets/tools/i18n/translations/i18n_el.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_el.ts rename to examples/widgets/tools/i18n/translations/i18n_el.ts diff --git a/examples/tools/i18n/translations/i18n_en.qm b/examples/widgets/tools/i18n/translations/i18n_en.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_en.qm rename to examples/widgets/tools/i18n/translations/i18n_en.qm diff --git a/examples/tools/i18n/translations/i18n_en.ts b/examples/widgets/tools/i18n/translations/i18n_en.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_en.ts rename to examples/widgets/tools/i18n/translations/i18n_en.ts diff --git a/examples/tools/i18n/translations/i18n_eo.qm b/examples/widgets/tools/i18n/translations/i18n_eo.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_eo.qm rename to examples/widgets/tools/i18n/translations/i18n_eo.qm diff --git a/examples/tools/i18n/translations/i18n_eo.ts b/examples/widgets/tools/i18n/translations/i18n_eo.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_eo.ts rename to examples/widgets/tools/i18n/translations/i18n_eo.ts diff --git a/examples/tools/i18n/translations/i18n_fr.qm b/examples/widgets/tools/i18n/translations/i18n_fr.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_fr.qm rename to examples/widgets/tools/i18n/translations/i18n_fr.qm diff --git a/examples/tools/i18n/translations/i18n_fr.ts b/examples/widgets/tools/i18n/translations/i18n_fr.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_fr.ts rename to examples/widgets/tools/i18n/translations/i18n_fr.ts diff --git a/examples/tools/i18n/translations/i18n_it.qm b/examples/widgets/tools/i18n/translations/i18n_it.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_it.qm rename to examples/widgets/tools/i18n/translations/i18n_it.qm diff --git a/examples/tools/i18n/translations/i18n_it.ts b/examples/widgets/tools/i18n/translations/i18n_it.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_it.ts rename to examples/widgets/tools/i18n/translations/i18n_it.ts diff --git a/examples/tools/i18n/translations/i18n_jp.qm b/examples/widgets/tools/i18n/translations/i18n_jp.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_jp.qm rename to examples/widgets/tools/i18n/translations/i18n_jp.qm diff --git a/examples/tools/i18n/translations/i18n_jp.ts b/examples/widgets/tools/i18n/translations/i18n_jp.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_jp.ts rename to examples/widgets/tools/i18n/translations/i18n_jp.ts diff --git a/examples/tools/i18n/translations/i18n_ko.qm b/examples/widgets/tools/i18n/translations/i18n_ko.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_ko.qm rename to examples/widgets/tools/i18n/translations/i18n_ko.qm diff --git a/examples/tools/i18n/translations/i18n_ko.ts b/examples/widgets/tools/i18n/translations/i18n_ko.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_ko.ts rename to examples/widgets/tools/i18n/translations/i18n_ko.ts diff --git a/examples/tools/i18n/translations/i18n_no.qm b/examples/widgets/tools/i18n/translations/i18n_no.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_no.qm rename to examples/widgets/tools/i18n/translations/i18n_no.qm diff --git a/examples/tools/i18n/translations/i18n_no.ts b/examples/widgets/tools/i18n/translations/i18n_no.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_no.ts rename to examples/widgets/tools/i18n/translations/i18n_no.ts diff --git a/examples/tools/i18n/translations/i18n_ru.qm b/examples/widgets/tools/i18n/translations/i18n_ru.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_ru.qm rename to examples/widgets/tools/i18n/translations/i18n_ru.qm diff --git a/examples/tools/i18n/translations/i18n_ru.ts b/examples/widgets/tools/i18n/translations/i18n_ru.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_ru.ts rename to examples/widgets/tools/i18n/translations/i18n_ru.ts diff --git a/examples/tools/i18n/translations/i18n_sv.qm b/examples/widgets/tools/i18n/translations/i18n_sv.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_sv.qm rename to examples/widgets/tools/i18n/translations/i18n_sv.qm diff --git a/examples/tools/i18n/translations/i18n_sv.ts b/examples/widgets/tools/i18n/translations/i18n_sv.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_sv.ts rename to examples/widgets/tools/i18n/translations/i18n_sv.ts diff --git a/examples/tools/i18n/translations/i18n_zh.qm b/examples/widgets/tools/i18n/translations/i18n_zh.qm similarity index 100% rename from examples/tools/i18n/translations/i18n_zh.qm rename to examples/widgets/tools/i18n/translations/i18n_zh.qm diff --git a/examples/tools/i18n/translations/i18n_zh.ts b/examples/widgets/tools/i18n/translations/i18n_zh.ts similarity index 100% rename from examples/tools/i18n/translations/i18n_zh.ts rename to examples/widgets/tools/i18n/translations/i18n_zh.ts diff --git a/examples/tools/plugandpaint/interfaces.h b/examples/widgets/tools/plugandpaint/interfaces.h similarity index 100% rename from examples/tools/plugandpaint/interfaces.h rename to examples/widgets/tools/plugandpaint/interfaces.h diff --git a/examples/tools/plugandpaint/main.cpp b/examples/widgets/tools/plugandpaint/main.cpp similarity index 100% rename from examples/tools/plugandpaint/main.cpp rename to examples/widgets/tools/plugandpaint/main.cpp diff --git a/examples/tools/plugandpaint/mainwindow.cpp b/examples/widgets/tools/plugandpaint/mainwindow.cpp similarity index 100% rename from examples/tools/plugandpaint/mainwindow.cpp rename to examples/widgets/tools/plugandpaint/mainwindow.cpp diff --git a/examples/tools/plugandpaint/mainwindow.h b/examples/widgets/tools/plugandpaint/mainwindow.h similarity index 100% rename from examples/tools/plugandpaint/mainwindow.h rename to examples/widgets/tools/plugandpaint/mainwindow.h diff --git a/examples/tools/plugandpaint/paintarea.cpp b/examples/widgets/tools/plugandpaint/paintarea.cpp similarity index 100% rename from examples/tools/plugandpaint/paintarea.cpp rename to examples/widgets/tools/plugandpaint/paintarea.cpp diff --git a/examples/tools/plugandpaint/paintarea.h b/examples/widgets/tools/plugandpaint/paintarea.h similarity index 100% rename from examples/tools/plugandpaint/paintarea.h rename to examples/widgets/tools/plugandpaint/paintarea.h diff --git a/examples/tools/plugandpaint/plugandpaint.desktop b/examples/widgets/tools/plugandpaint/plugandpaint.desktop similarity index 100% rename from examples/tools/plugandpaint/plugandpaint.desktop rename to examples/widgets/tools/plugandpaint/plugandpaint.desktop diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/widgets/tools/plugandpaint/plugandpaint.pro similarity index 87% rename from examples/tools/plugandpaint/plugandpaint.pro rename to examples/widgets/tools/plugandpaint/plugandpaint.pro index d9b836c7ae..2c8c5117ee 100644 --- a/examples/tools/plugandpaint/plugandpaint.pro +++ b/examples/widgets/tools/plugandpaint/plugandpaint.pro @@ -8,7 +8,7 @@ SOURCES = main.cpp \ paintarea.cpp \ plugindialog.cpp -LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools +LIBS = -L$${QT_BUILD_TREE}/examples/widgets/tools/plugandpaint/plugins -lpnp_basictools if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug diff --git a/examples/tools/plugandpaint/plugindialog.cpp b/examples/widgets/tools/plugandpaint/plugindialog.cpp similarity index 100% rename from examples/tools/plugandpaint/plugindialog.cpp rename to examples/widgets/tools/plugandpaint/plugindialog.cpp diff --git a/examples/tools/plugandpaint/plugindialog.h b/examples/widgets/tools/plugandpaint/plugindialog.h similarity index 100% rename from examples/tools/plugandpaint/plugindialog.h rename to examples/widgets/tools/plugandpaint/plugindialog.h diff --git a/examples/tools/plugandpaintplugins/basictools/basictools.json b/examples/widgets/tools/plugandpaintplugins/basictools/basictools.json similarity index 100% rename from examples/tools/plugandpaintplugins/basictools/basictools.json rename to examples/widgets/tools/plugandpaintplugins/basictools/basictools.json diff --git a/examples/tools/plugandpaintplugins/basictools/basictools.pro b/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro similarity index 100% rename from examples/tools/plugandpaintplugins/basictools/basictools.pro rename to examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro diff --git a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp b/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp similarity index 100% rename from examples/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp rename to examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.cpp diff --git a/examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h b/examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h similarity index 100% rename from examples/tools/plugandpaintplugins/basictools/basictoolsplugin.h rename to examples/widgets/tools/plugandpaintplugins/basictools/basictoolsplugin.h diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.json b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.json similarity index 100% rename from examples/tools/plugandpaintplugins/extrafilters/extrafilters.json rename to examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.json diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro similarity index 100% rename from examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro rename to examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp similarity index 100% rename from examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp rename to examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h similarity index 100% rename from examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h rename to examples/widgets/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h diff --git a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro b/examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro similarity index 100% rename from examples/tools/plugandpaintplugins/plugandpaintplugins.pro rename to examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro diff --git a/examples/tools/regexp/main.cpp b/examples/widgets/tools/regexp/main.cpp similarity index 100% rename from examples/tools/regexp/main.cpp rename to examples/widgets/tools/regexp/main.cpp diff --git a/examples/tools/regexp/regexp.desktop b/examples/widgets/tools/regexp/regexp.desktop similarity index 100% rename from examples/tools/regexp/regexp.desktop rename to examples/widgets/tools/regexp/regexp.desktop diff --git a/examples/tools/regexp/regexp.pro b/examples/widgets/tools/regexp/regexp.pro similarity index 100% rename from examples/tools/regexp/regexp.pro rename to examples/widgets/tools/regexp/regexp.pro diff --git a/examples/tools/regexp/regexpdialog.cpp b/examples/widgets/tools/regexp/regexpdialog.cpp similarity index 100% rename from examples/tools/regexp/regexpdialog.cpp rename to examples/widgets/tools/regexp/regexpdialog.cpp diff --git a/examples/tools/regexp/regexpdialog.h b/examples/widgets/tools/regexp/regexpdialog.h similarity index 100% rename from examples/tools/regexp/regexpdialog.h rename to examples/widgets/tools/regexp/regexpdialog.h diff --git a/examples/tools/settingseditor/inifiles/licensepage.ini b/examples/widgets/tools/settingseditor/inifiles/licensepage.ini similarity index 100% rename from examples/tools/settingseditor/inifiles/licensepage.ini rename to examples/widgets/tools/settingseditor/inifiles/licensepage.ini diff --git a/examples/tools/settingseditor/inifiles/qsa.ini b/examples/widgets/tools/settingseditor/inifiles/qsa.ini similarity index 100% rename from examples/tools/settingseditor/inifiles/qsa.ini rename to examples/widgets/tools/settingseditor/inifiles/qsa.ini diff --git a/examples/tools/settingseditor/locationdialog.cpp b/examples/widgets/tools/settingseditor/locationdialog.cpp similarity index 100% rename from examples/tools/settingseditor/locationdialog.cpp rename to examples/widgets/tools/settingseditor/locationdialog.cpp diff --git a/examples/tools/settingseditor/locationdialog.h b/examples/widgets/tools/settingseditor/locationdialog.h similarity index 100% rename from examples/tools/settingseditor/locationdialog.h rename to examples/widgets/tools/settingseditor/locationdialog.h diff --git a/examples/tools/settingseditor/main.cpp b/examples/widgets/tools/settingseditor/main.cpp similarity index 100% rename from examples/tools/settingseditor/main.cpp rename to examples/widgets/tools/settingseditor/main.cpp diff --git a/examples/tools/settingseditor/mainwindow.cpp b/examples/widgets/tools/settingseditor/mainwindow.cpp similarity index 100% rename from examples/tools/settingseditor/mainwindow.cpp rename to examples/widgets/tools/settingseditor/mainwindow.cpp diff --git a/examples/tools/settingseditor/mainwindow.h b/examples/widgets/tools/settingseditor/mainwindow.h similarity index 100% rename from examples/tools/settingseditor/mainwindow.h rename to examples/widgets/tools/settingseditor/mainwindow.h diff --git a/examples/tools/settingseditor/settingseditor.desktop b/examples/widgets/tools/settingseditor/settingseditor.desktop similarity index 100% rename from examples/tools/settingseditor/settingseditor.desktop rename to examples/widgets/tools/settingseditor/settingseditor.desktop diff --git a/examples/tools/settingseditor/settingseditor.pro b/examples/widgets/tools/settingseditor/settingseditor.pro similarity index 100% rename from examples/tools/settingseditor/settingseditor.pro rename to examples/widgets/tools/settingseditor/settingseditor.pro diff --git a/examples/tools/settingseditor/settingstree.cpp b/examples/widgets/tools/settingseditor/settingstree.cpp similarity index 100% rename from examples/tools/settingseditor/settingstree.cpp rename to examples/widgets/tools/settingseditor/settingstree.cpp diff --git a/examples/tools/settingseditor/settingstree.h b/examples/widgets/tools/settingseditor/settingstree.h similarity index 100% rename from examples/tools/settingseditor/settingstree.h rename to examples/widgets/tools/settingseditor/settingstree.h diff --git a/examples/tools/settingseditor/variantdelegate.cpp b/examples/widgets/tools/settingseditor/variantdelegate.cpp similarity index 100% rename from examples/tools/settingseditor/variantdelegate.cpp rename to examples/widgets/tools/settingseditor/variantdelegate.cpp diff --git a/examples/tools/settingseditor/variantdelegate.h b/examples/widgets/tools/settingseditor/variantdelegate.h similarity index 100% rename from examples/tools/settingseditor/variantdelegate.h rename to examples/widgets/tools/settingseditor/variantdelegate.h diff --git a/examples/tools/styleplugin/plugin/plugin.pro b/examples/widgets/tools/styleplugin/plugin/plugin.pro similarity index 100% rename from examples/tools/styleplugin/plugin/plugin.pro rename to examples/widgets/tools/styleplugin/plugin/plugin.pro diff --git a/examples/tools/styleplugin/plugin/simplestyle.cpp b/examples/widgets/tools/styleplugin/plugin/simplestyle.cpp similarity index 100% rename from examples/tools/styleplugin/plugin/simplestyle.cpp rename to examples/widgets/tools/styleplugin/plugin/simplestyle.cpp diff --git a/examples/tools/styleplugin/plugin/simplestyle.h b/examples/widgets/tools/styleplugin/plugin/simplestyle.h similarity index 100% rename from examples/tools/styleplugin/plugin/simplestyle.h rename to examples/widgets/tools/styleplugin/plugin/simplestyle.h diff --git a/examples/tools/styleplugin/plugin/simplestyle.json b/examples/widgets/tools/styleplugin/plugin/simplestyle.json similarity index 100% rename from examples/tools/styleplugin/plugin/simplestyle.json rename to examples/widgets/tools/styleplugin/plugin/simplestyle.json diff --git a/examples/tools/styleplugin/plugin/simplestyleplugin.cpp b/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp similarity index 100% rename from examples/tools/styleplugin/plugin/simplestyleplugin.cpp rename to examples/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp diff --git a/examples/tools/styleplugin/plugin/simplestyleplugin.h b/examples/widgets/tools/styleplugin/plugin/simplestyleplugin.h similarity index 100% rename from examples/tools/styleplugin/plugin/simplestyleplugin.h rename to examples/widgets/tools/styleplugin/plugin/simplestyleplugin.h diff --git a/examples/tools/styleplugin/styleplugin.pro b/examples/widgets/tools/styleplugin/styleplugin.pro similarity index 100% rename from examples/tools/styleplugin/styleplugin.pro rename to examples/widgets/tools/styleplugin/styleplugin.pro diff --git a/examples/tools/styleplugin/stylewindow/main.cpp b/examples/widgets/tools/styleplugin/stylewindow/main.cpp similarity index 100% rename from examples/tools/styleplugin/stylewindow/main.cpp rename to examples/widgets/tools/styleplugin/stylewindow/main.cpp diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.cpp b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.cpp similarity index 100% rename from examples/tools/styleplugin/stylewindow/stylewindow.cpp rename to examples/widgets/tools/styleplugin/stylewindow/stylewindow.cpp diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.h b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.h similarity index 100% rename from examples/tools/styleplugin/stylewindow/stylewindow.h rename to examples/widgets/tools/styleplugin/stylewindow/stylewindow.h diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.pro b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro similarity index 100% rename from examples/tools/styleplugin/stylewindow/stylewindow.pro rename to examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro new file mode 100644 index 0000000000..aaf4440d23 --- /dev/null +++ b/examples/widgets/tools/tools.pro @@ -0,0 +1,22 @@ +TEMPLATE = subdirs +SUBDIRS = \ + codecs \ + completer \ + customcompleter \ + echoplugin \ + i18n \ + plugandpaint \ + plugandpaintplugins \ + regexp \ + settingseditor \ + styleplugin \ + treemodelcompleter \ + undo \ + undoframework + +plugandpaint.depends = plugandpaintplugins + +# install +sources.files = tools.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools +INSTALLS += sources diff --git a/examples/tools/treemodelcompleter/main.cpp b/examples/widgets/tools/treemodelcompleter/main.cpp similarity index 100% rename from examples/tools/treemodelcompleter/main.cpp rename to examples/widgets/tools/treemodelcompleter/main.cpp diff --git a/examples/tools/treemodelcompleter/mainwindow.cpp b/examples/widgets/tools/treemodelcompleter/mainwindow.cpp similarity index 100% rename from examples/tools/treemodelcompleter/mainwindow.cpp rename to examples/widgets/tools/treemodelcompleter/mainwindow.cpp diff --git a/examples/tools/treemodelcompleter/mainwindow.h b/examples/widgets/tools/treemodelcompleter/mainwindow.h similarity index 100% rename from examples/tools/treemodelcompleter/mainwindow.h rename to examples/widgets/tools/treemodelcompleter/mainwindow.h diff --git a/examples/tools/treemodelcompleter/resources/treemodel.txt b/examples/widgets/tools/treemodelcompleter/resources/treemodel.txt similarity index 100% rename from examples/tools/treemodelcompleter/resources/treemodel.txt rename to examples/widgets/tools/treemodelcompleter/resources/treemodel.txt diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.cpp b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.cpp similarity index 100% rename from examples/tools/treemodelcompleter/treemodelcompleter.cpp rename to examples/widgets/tools/treemodelcompleter/treemodelcompleter.cpp diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.desktop b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.desktop similarity index 100% rename from examples/tools/treemodelcompleter/treemodelcompleter.desktop rename to examples/widgets/tools/treemodelcompleter/treemodelcompleter.desktop diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.h b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.h similarity index 100% rename from examples/tools/treemodelcompleter/treemodelcompleter.h rename to examples/widgets/tools/treemodelcompleter/treemodelcompleter.h diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.pro b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro similarity index 100% rename from examples/tools/treemodelcompleter/treemodelcompleter.pro rename to examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.qrc b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.qrc similarity index 100% rename from examples/tools/treemodelcompleter/treemodelcompleter.qrc rename to examples/widgets/tools/treemodelcompleter/treemodelcompleter.qrc diff --git a/examples/tools/undo/commands.cpp b/examples/widgets/tools/undo/commands.cpp similarity index 100% rename from examples/tools/undo/commands.cpp rename to examples/widgets/tools/undo/commands.cpp diff --git a/examples/tools/undo/commands.h b/examples/widgets/tools/undo/commands.h similarity index 100% rename from examples/tools/undo/commands.h rename to examples/widgets/tools/undo/commands.h diff --git a/examples/tools/undo/document.cpp b/examples/widgets/tools/undo/document.cpp similarity index 100% rename from examples/tools/undo/document.cpp rename to examples/widgets/tools/undo/document.cpp diff --git a/examples/tools/undo/document.h b/examples/widgets/tools/undo/document.h similarity index 100% rename from examples/tools/undo/document.h rename to examples/widgets/tools/undo/document.h diff --git a/examples/tools/undo/icons/background.png b/examples/widgets/tools/undo/icons/background.png similarity index 100% rename from examples/tools/undo/icons/background.png rename to examples/widgets/tools/undo/icons/background.png diff --git a/examples/tools/undo/icons/blue.png b/examples/widgets/tools/undo/icons/blue.png similarity index 100% rename from examples/tools/undo/icons/blue.png rename to examples/widgets/tools/undo/icons/blue.png diff --git a/examples/tools/undo/icons/circle.png b/examples/widgets/tools/undo/icons/circle.png similarity index 100% rename from examples/tools/undo/icons/circle.png rename to examples/widgets/tools/undo/icons/circle.png diff --git a/examples/tools/undo/icons/exit.png b/examples/widgets/tools/undo/icons/exit.png similarity index 100% rename from examples/tools/undo/icons/exit.png rename to examples/widgets/tools/undo/icons/exit.png diff --git a/examples/tools/undo/icons/fileclose.png b/examples/widgets/tools/undo/icons/fileclose.png similarity index 100% rename from examples/tools/undo/icons/fileclose.png rename to examples/widgets/tools/undo/icons/fileclose.png diff --git a/examples/tools/undo/icons/filenew.png b/examples/widgets/tools/undo/icons/filenew.png similarity index 100% rename from examples/tools/undo/icons/filenew.png rename to examples/widgets/tools/undo/icons/filenew.png diff --git a/examples/tools/undo/icons/fileopen.png b/examples/widgets/tools/undo/icons/fileopen.png similarity index 100% rename from examples/tools/undo/icons/fileopen.png rename to examples/widgets/tools/undo/icons/fileopen.png diff --git a/examples/tools/undo/icons/filesave.png b/examples/widgets/tools/undo/icons/filesave.png similarity index 100% rename from examples/tools/undo/icons/filesave.png rename to examples/widgets/tools/undo/icons/filesave.png diff --git a/examples/tools/undo/icons/green.png b/examples/widgets/tools/undo/icons/green.png similarity index 100% rename from examples/tools/undo/icons/green.png rename to examples/widgets/tools/undo/icons/green.png diff --git a/examples/tools/undo/icons/ok.png b/examples/widgets/tools/undo/icons/ok.png similarity index 100% rename from examples/tools/undo/icons/ok.png rename to examples/widgets/tools/undo/icons/ok.png diff --git a/examples/tools/undo/icons/rectangle.png b/examples/widgets/tools/undo/icons/rectangle.png similarity index 100% rename from examples/tools/undo/icons/rectangle.png rename to examples/widgets/tools/undo/icons/rectangle.png diff --git a/examples/tools/undo/icons/red.png b/examples/widgets/tools/undo/icons/red.png similarity index 100% rename from examples/tools/undo/icons/red.png rename to examples/widgets/tools/undo/icons/red.png diff --git a/examples/tools/undo/icons/redo.png b/examples/widgets/tools/undo/icons/redo.png similarity index 100% rename from examples/tools/undo/icons/redo.png rename to examples/widgets/tools/undo/icons/redo.png diff --git a/examples/tools/undo/icons/remove.png b/examples/widgets/tools/undo/icons/remove.png similarity index 100% rename from examples/tools/undo/icons/remove.png rename to examples/widgets/tools/undo/icons/remove.png diff --git a/examples/tools/undo/icons/triangle.png b/examples/widgets/tools/undo/icons/triangle.png similarity index 100% rename from examples/tools/undo/icons/triangle.png rename to examples/widgets/tools/undo/icons/triangle.png diff --git a/examples/tools/undo/icons/undo.png b/examples/widgets/tools/undo/icons/undo.png similarity index 100% rename from examples/tools/undo/icons/undo.png rename to examples/widgets/tools/undo/icons/undo.png diff --git a/examples/tools/undo/main.cpp b/examples/widgets/tools/undo/main.cpp similarity index 100% rename from examples/tools/undo/main.cpp rename to examples/widgets/tools/undo/main.cpp diff --git a/examples/tools/undo/mainwindow.cpp b/examples/widgets/tools/undo/mainwindow.cpp similarity index 100% rename from examples/tools/undo/mainwindow.cpp rename to examples/widgets/tools/undo/mainwindow.cpp diff --git a/examples/tools/undo/mainwindow.h b/examples/widgets/tools/undo/mainwindow.h similarity index 100% rename from examples/tools/undo/mainwindow.h rename to examples/widgets/tools/undo/mainwindow.h diff --git a/examples/tools/undo/mainwindow.ui b/examples/widgets/tools/undo/mainwindow.ui similarity index 100% rename from examples/tools/undo/mainwindow.ui rename to examples/widgets/tools/undo/mainwindow.ui diff --git a/examples/tools/undo/undo.pro b/examples/widgets/tools/undo/undo.pro similarity index 100% rename from examples/tools/undo/undo.pro rename to examples/widgets/tools/undo/undo.pro diff --git a/examples/tools/undo/undo.qrc b/examples/widgets/tools/undo/undo.qrc similarity index 100% rename from examples/tools/undo/undo.qrc rename to examples/widgets/tools/undo/undo.qrc diff --git a/examples/tools/undoframework/commands.cpp b/examples/widgets/tools/undoframework/commands.cpp similarity index 100% rename from examples/tools/undoframework/commands.cpp rename to examples/widgets/tools/undoframework/commands.cpp diff --git a/examples/tools/undoframework/commands.h b/examples/widgets/tools/undoframework/commands.h similarity index 100% rename from examples/tools/undoframework/commands.h rename to examples/widgets/tools/undoframework/commands.h diff --git a/examples/tools/undoframework/diagramitem.cpp b/examples/widgets/tools/undoframework/diagramitem.cpp similarity index 100% rename from examples/tools/undoframework/diagramitem.cpp rename to examples/widgets/tools/undoframework/diagramitem.cpp diff --git a/examples/tools/undoframework/diagramitem.h b/examples/widgets/tools/undoframework/diagramitem.h similarity index 100% rename from examples/tools/undoframework/diagramitem.h rename to examples/widgets/tools/undoframework/diagramitem.h diff --git a/examples/tools/undoframework/diagramscene.cpp b/examples/widgets/tools/undoframework/diagramscene.cpp similarity index 100% rename from examples/tools/undoframework/diagramscene.cpp rename to examples/widgets/tools/undoframework/diagramscene.cpp diff --git a/examples/tools/undoframework/diagramscene.h b/examples/widgets/tools/undoframework/diagramscene.h similarity index 100% rename from examples/tools/undoframework/diagramscene.h rename to examples/widgets/tools/undoframework/diagramscene.h diff --git a/examples/tools/undoframework/images/cross.png b/examples/widgets/tools/undoframework/images/cross.png similarity index 100% rename from examples/tools/undoframework/images/cross.png rename to examples/widgets/tools/undoframework/images/cross.png diff --git a/examples/tools/undoframework/main.cpp b/examples/widgets/tools/undoframework/main.cpp similarity index 100% rename from examples/tools/undoframework/main.cpp rename to examples/widgets/tools/undoframework/main.cpp diff --git a/examples/tools/undoframework/mainwindow.cpp b/examples/widgets/tools/undoframework/mainwindow.cpp similarity index 100% rename from examples/tools/undoframework/mainwindow.cpp rename to examples/widgets/tools/undoframework/mainwindow.cpp diff --git a/examples/tools/undoframework/mainwindow.h b/examples/widgets/tools/undoframework/mainwindow.h similarity index 100% rename from examples/tools/undoframework/mainwindow.h rename to examples/widgets/tools/undoframework/mainwindow.h diff --git a/examples/tools/undoframework/undoframework.desktop b/examples/widgets/tools/undoframework/undoframework.desktop similarity index 100% rename from examples/tools/undoframework/undoframework.desktop rename to examples/widgets/tools/undoframework/undoframework.desktop diff --git a/examples/tools/undoframework/undoframework.pro b/examples/widgets/tools/undoframework/undoframework.pro similarity index 100% rename from examples/tools/undoframework/undoframework.pro rename to examples/widgets/tools/undoframework/undoframework.pro diff --git a/examples/tools/undoframework/undoframework.qrc b/examples/widgets/tools/undoframework/undoframework.qrc similarity index 100% rename from examples/tools/undoframework/undoframework.qrc rename to examples/widgets/tools/undoframework/undoframework.qrc diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 4f527b1540..d6d86dd3a6 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -15,6 +15,7 @@ SUBDIRS = \ richtext \ scroller \ statemachine \ + tools \ tutorials \ widgets @@ -23,4 +24,4 @@ contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows # install sources.files = *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/widgets -INSTALLS += sources \ No newline at end of file +INSTALLS += sources