Fix examples directory layout

Move examples into a dedicated 'serialport' directory. This is
in line with what the other modules do, and makes sure that
the examples show up  in a sensible place even for the 'combined'
source packages.

Task-number: QTBUG-30912
Change-Id: Iefa2b634df3d2eb34f655b34f6fb24a224b78869
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

51 files changed, 30 insertions, 28 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index 32e50b28..85843beb 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,8 +1,3 @@
 TEMPLATE = subdirs
-CONFIG += ordered
-SUBDIRS = cenumerator
-greaterThan(QT_MAJOR_VERSION, 4) {
-    !isEmpty(QT.widgets.name):SUBDIRS += enumerator terminal blockingmaster blockingslave
-} else {
-    SUBDIRS += enumerator terminal blockingmaster blockingslave master slave
-}
+
+SUBDIRS += serialport
diff --git a/examples/blockingmaster/blockingmaster.pro b/examples/serialport/blockingmaster/blockingmaster.pro
index 5f21cdbf..5f21cdbf 100644
--- a/examples/blockingmaster/blockingmaster.pro
+++ b/examples/serialport/blockingmaster/blockingmaster.pro
diff --git a/examples/blockingmaster/dialog.cpp b/examples/serialport/blockingmaster/dialog.cpp
index 7cd04e02..7cd04e02 100644
--- a/examples/blockingmaster/dialog.cpp
+++ b/examples/serialport/blockingmaster/dialog.cpp
diff --git a/examples/blockingmaster/dialog.h b/examples/serialport/blockingmaster/dialog.h
index 14d1e56f..14d1e56f 100644
--- a/examples/blockingmaster/dialog.h
+++ b/examples/serialport/blockingmaster/dialog.h
diff --git a/examples/blockingmaster/main.cpp b/examples/serialport/blockingmaster/main.cpp
index fc2e334e..fc2e334e 100644
--- a/examples/blockingmaster/main.cpp
+++ b/examples/serialport/blockingmaster/main.cpp
diff --git a/examples/blockingmaster/masterthread.cpp b/examples/serialport/blockingmaster/masterthread.cpp
index 061ddd6e..061ddd6e 100644
--- a/examples/blockingmaster/masterthread.cpp
+++ b/examples/serialport/blockingmaster/masterthread.cpp
diff --git a/examples/blockingmaster/masterthread.h b/examples/serialport/blockingmaster/masterthread.h
index ebbd43de..ebbd43de 100644
--- a/examples/blockingmaster/masterthread.h
+++ b/examples/serialport/blockingmaster/masterthread.h
diff --git a/examples/blockingslave/blockingslave.pro b/examples/serialport/blockingslave/blockingslave.pro
index 5a5fb78c..5a5fb78c 100644
--- a/examples/blockingslave/blockingslave.pro
+++ b/examples/serialport/blockingslave/blockingslave.pro
diff --git a/examples/blockingslave/dialog.cpp b/examples/serialport/blockingslave/dialog.cpp
index 9bdbbf67..9bdbbf67 100644
--- a/examples/blockingslave/dialog.cpp
+++ b/examples/serialport/blockingslave/dialog.cpp
diff --git a/examples/blockingslave/dialog.h b/examples/serialport/blockingslave/dialog.h
index 27056b29..27056b29 100644
--- a/examples/blockingslave/dialog.h
+++ b/examples/serialport/blockingslave/dialog.h
diff --git a/examples/blockingslave/main.cpp b/examples/serialport/blockingslave/main.cpp
index fc2e334e..fc2e334e 100644
--- a/examples/blockingslave/main.cpp
+++ b/examples/serialport/blockingslave/main.cpp
diff --git a/examples/blockingslave/slavethread.cpp b/examples/serialport/blockingslave/slavethread.cpp
index a31db256..a31db256 100644
--- a/examples/blockingslave/slavethread.cpp
+++ b/examples/serialport/blockingslave/slavethread.cpp
diff --git a/examples/blockingslave/slavethread.h b/examples/serialport/blockingslave/slavethread.h
index 9ba78b06..9ba78b06 100644
--- a/examples/blockingslave/slavethread.h
+++ b/examples/serialport/blockingslave/slavethread.h
diff --git a/examples/cenumerator/cenumerator.pro b/examples/serialport/cenumerator/cenumerator.pro
index 464e1d95..464e1d95 100644
--- a/examples/cenumerator/cenumerator.pro
+++ b/examples/serialport/cenumerator/cenumerator.pro
diff --git a/examples/cenumerator/main.cpp b/examples/serialport/cenumerator/main.cpp
index f55b92d9..f55b92d9 100644
--- a/examples/cenumerator/main.cpp
+++ b/examples/serialport/cenumerator/main.cpp
diff --git a/examples/doc/blockingmaster.qdoc b/examples/serialport/doc/blockingmaster.qdoc
index f45530ec..40ac0702 100644
--- a/examples/doc/blockingmaster.qdoc
+++ b/examples/serialport/doc/blockingmaster.qdoc
@@ -53,7 +53,7 @@
     \endlist
 
     In this example, the synchronous approach is demonstrated. The
-    \l{examples/terminal}{Simple Terminal} example illustrates the
+    \l{terminal}{Simple Terminal} example illustrates the
     asynchronous approach.
 
     The purpose of this example is to demonstrate a pattern that you can use
@@ -65,7 +65,7 @@
     necessarily add unmanagable complexity to your application.
 
     This application is a Master, that demonstrate the work paired with Slave
-    application \l{examples/blockingslave}{Blocking Slave Example}.
+    application \l{blockingslave}{Blocking Slave Example}.
 
     The Master application is initiate the transfer request via serial port to
     the Slave application and wait for a response from it.
diff --git a/examples/doc/blockingslave.qdoc b/examples/serialport/doc/blockingslave.qdoc
index b928fd1b..4b835d98 100644
--- a/examples/doc/blockingslave.qdoc
+++ b/examples/serialport/doc/blockingslave.qdoc
@@ -53,8 +53,7 @@
     \endlist
 
     In this example, the synchronous approach is demonstrated. The
-    \l{examples/slave}{Slave Example} example illustrates the
-    asynchronous approach.
+    \l{slave}{Slave Example} example illustrates the asynchronous approach.
 
     The purpose of this example is to demonstrate a pattern that you can use
     to simplify your serial programming code, without losing responsiveness
@@ -65,7 +64,7 @@
     necessarily add unmanagable complexity to your application.
 
     This application is a Slave, that demonstrate the work paired with Master
-    application \l{examples/blockingmaster}{Blocking Master Example}.
+    application \l{blockingmaster}{Blocking Master Example}.
 
     The Slave application is receives the request via serial port from
     the Master application and send a response to it.
diff --git a/examples/doc/cenumerator.qdoc b/examples/serialport/doc/cenumerator.qdoc
index 0766931a..0766931a 100644
--- a/examples/doc/cenumerator.qdoc
+++ b/examples/serialport/doc/cenumerator.qdoc
diff --git a/examples/doc/enumerator.qdoc b/examples/serialport/doc/enumerator.qdoc
index 0847d8a8..0847d8a8 100644
--- a/examples/doc/enumerator.qdoc
+++ b/examples/serialport/doc/enumerator.qdoc
diff --git a/examples/doc/terminal.qdoc b/examples/serialport/doc/terminal.qdoc
index 4a6b0d6c..b432390b 100644
--- a/examples/doc/terminal.qdoc
+++ b/examples/serialport/doc/terminal.qdoc
@@ -63,22 +63,22 @@
 
     \list
 
-    \li \l{examples/terminal/mainwindow.cpp}{MainWindow} - is the main application
+    \li \l{terminal/mainwindow.cpp}{MainWindow} - is the main application
     window that contains all the working logic for the serial port programming,
     including configuration, I/O processing and so forth, while inheriting the
     QMainWindow.
 
-    \li \l{examples/terminal/console.cpp}{Console} - is the central widget of the
+    \li \l{terminal/console.cpp}{Console} - is the central widget of the
     main window, displaying the transmitted or received data. The widget is
     derived from the QPlainTextEdit class.
 
-    \li \l{examples/terminal/settingsdialog.cpp}{SettingsDialog} - is a dialog
+    \li \l{terminal/settingsdialog.cpp}{SettingsDialog} - is a dialog
     for configuring the serial port, as well as for displaying the available
     serial ports and information about them.
 
     \endlist
 
-    The serial port is instantiated in the \l{examples/terminal/mainwindow.cpp}{MainWindow}
+    The serial port is instantiated in the \l{terminal/mainwindow.cpp}{MainWindow}
     constructor. The main widget is passed as the parent, so the object deletion
     happens automatically according to the the parent and child mechanism in Qt:
 
@@ -99,13 +99,13 @@
 
     \snippet terminal/mainwindow.cpp 4
 
-    In this slot, the settings are read from \l{examples/terminal/settingsdialog.cpp}
+    In this slot, the settings are read from \l{terminal/settingsdialog.cpp}
     {SettingsDialog} and an attempt is made to open and initialize the serial
     port accordingly. If successful, the status bar displays a message that the
     opening was successful with the given configuration; otherwise, a messagebox
     is displayed with the appropriate error code and message. If the serial port
     settings have never been called
-    \l{examples/terminal/settingsdialog.cpp}{SettingsDialog}, then the terminal
+    \l{terminal/settingsdialog.cpp}{SettingsDialog}, then the terminal
     attempts to open the port with the default settings: 9600 8N1.
 
     Clicking on the \b{Disconnect} button invokes the \c closeSerialPort()
@@ -120,7 +120,7 @@
     \snippet terminal/mainwindow.cpp 6
 
     This slot sends the characters typed in the given
-    \l{examples/terminal/console.cpp}{Console} widget to the serial port.
+    \l{terminal/console.cpp}{Console} widget to the serial port.
 
     When the serial port receives new data, the signal
     \l{QTcpSocket::readyRead()}{readyRead()} is emitted, and that signal is
@@ -129,13 +129,13 @@
     \snippet terminal/mainwindow.cpp 7
 
     This slot reads the data from the serial port and displays that in the
-    \l{examples/terminal/console.cpp}{Console} widget.
+    \l{terminal/console.cpp}{Console} widget.
 
     Clicking on the \b{Configure} button invokes the \c show() slot which
-    belongs to the \l{examples/terminal/settingsdialog.cpp}{SettingsDialog}
+    belongs to the \l{terminal/settingsdialog.cpp}{SettingsDialog}
     widget.
 
-    This method displays the \l{examples/terminal/settingsdialog.cpp}{SettingsDialog}
+    This method displays the \l{terminal/settingsdialog.cpp}{SettingsDialog}
     in which the user can choose the desired serial port, see the information
     about the selected port, and set the desired parameters of the given serial
     port.
diff --git a/examples/enumerator/enumerator.pro b/examples/serialport/enumerator/enumerator.pro
index 21233a80..21233a80 100644
--- a/examples/enumerator/enumerator.pro
+++ b/examples/serialport/enumerator/enumerator.pro
diff --git a/examples/enumerator/main.cpp b/examples/serialport/enumerator/main.cpp
index 9e34d38c..9e34d38c 100644
--- a/examples/enumerator/main.cpp
+++ b/examples/serialport/enumerator/main.cpp
diff --git a/examples/examples.qdoc b/examples/serialport/examples.qdoc
index 53cc35dc..f7dbbf9c 100644
--- a/examples/examples.qdoc
+++ b/examples/serialport/examples.qdoc
@@ -34,10 +34,10 @@
     \contentspage {Examples} {Contents}
 
     \list
-    \li \l doc/blockingmaster
-    \li \l doc/blockingslave
-    \li \l doc/cenumerator
-    \li \l doc/enumerator
-    \li \l doc/terminal
+    \li \l blockingmaster
+    \li \l blockingslave
+    \li \l cenumerator
+    \li \l enumerator
+    \li \l terminal
     \endlist
 */
diff --git a/examples/master/dialog.cpp b/examples/serialport/master/dialog.cpp
index e3a4b66e..e3a4b66e 100644
--- a/examples/master/dialog.cpp
+++ b/examples/serialport/master/dialog.cpp
diff --git a/examples/master/dialog.h b/examples/serialport/master/dialog.h
index c1ec416a..c1ec416a 100644
--- a/examples/master/dialog.h
+++ b/examples/serialport/master/dialog.h
diff --git a/examples/master/main.cpp b/examples/serialport/master/main.cpp
index fc2e334e..fc2e334e 100644
--- a/examples/master/main.cpp
+++ b/examples/serialport/master/main.cpp
diff --git a/examples/master/master.pro b/examples/serialport/master/master.pro
index 977de6c7..977de6c7 100644
--- a/examples/master/master.pro
+++ b/examples/serialport/master/master.pro
diff --git a/examples/serialport/serialport.pro b/examples/serialport/serialport.pro
new file mode 100644
index 00000000..32e50b28
--- /dev/null
+++ b/examples/serialport/serialport.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS = cenumerator
+greaterThan(QT_MAJOR_VERSION, 4) {
+    !isEmpty(QT.widgets.name):SUBDIRS += enumerator terminal blockingmaster blockingslave
+} else {
+    SUBDIRS += enumerator terminal blockingmaster blockingslave master slave
+}
diff --git a/examples/slave/dialog.cpp b/examples/serialport/slave/dialog.cpp
index 06a2a152..06a2a152 100644
--- a/examples/slave/dialog.cpp
+++ b/examples/serialport/slave/dialog.cpp
diff --git a/examples/slave/dialog.h b/examples/serialport/slave/dialog.h
index 6aafb2b1..6aafb2b1 100644
--- a/examples/slave/dialog.h
+++ b/examples/serialport/slave/dialog.h
diff --git a/examples/slave/main.cpp b/examples/serialport/slave/main.cpp
index fc2e334e..fc2e334e 100644
--- a/examples/slave/main.cpp
+++ b/examples/serialport/slave/main.cpp
diff --git a/examples/slave/slave.pro b/examples/serialport/slave/slave.pro
index df996ac1..df996ac1 100644
--- a/examples/slave/slave.pro
+++ b/examples/serialport/slave/slave.pro
diff --git a/examples/slave/slavethread.cpp b/examples/serialport/slave/slavethread.cpp
index a0177ffa..a0177ffa 100644
--- a/examples/slave/slavethread.cpp
+++ b/examples/serialport/slave/slavethread.cpp
diff --git a/examples/slave/slavethread.h b/examples/serialport/slave/slavethread.h
index 3ed1e0cd..3ed1e0cd 100644
--- a/examples/slave/slavethread.h
+++ b/examples/serialport/slave/slavethread.h
diff --git a/examples/terminal/console.cpp b/examples/serialport/terminal/console.cpp
index 7f3f891e..7f3f891e 100644
--- a/examples/terminal/console.cpp
+++ b/examples/serialport/terminal/console.cpp
diff --git a/examples/terminal/console.h b/examples/serialport/terminal/console.h
index 9b5ba1f8..9b5ba1f8 100644
--- a/examples/terminal/console.h
+++ b/examples/serialport/terminal/console.h
diff --git a/examples/terminal/images/application-exit.png b/examples/serialport/terminal/images/application-exit.png
index 32be6b3f..32be6b3f 100644
--- a/examples/terminal/images/application-exit.png
+++ b/examples/serialport/terminal/images/application-exit.png
diff --git a/examples/terminal/images/clear.png b/examples/serialport/terminal/images/clear.png
index aa612f1f..aa612f1f 100644
--- a/examples/terminal/images/clear.png
+++ b/examples/serialport/terminal/images/clear.png
diff --git a/examples/terminal/images/connect.png b/examples/serialport/terminal/images/connect.png
index dd5a51e9..dd5a51e9 100644
--- a/examples/terminal/images/connect.png
+++ b/examples/serialport/terminal/images/connect.png
diff --git a/examples/terminal/images/disconnect.png b/examples/serialport/terminal/images/disconnect.png
index fd58f7a4..fd58f7a4 100644
--- a/examples/terminal/images/disconnect.png
+++ b/examples/serialport/terminal/images/disconnect.png
diff --git a/examples/terminal/images/settings.png b/examples/serialport/terminal/images/settings.png
index 3d1042e2..3d1042e2 100644
--- a/examples/terminal/images/settings.png
+++ b/examples/serialport/terminal/images/settings.png
diff --git a/examples/terminal/main.cpp b/examples/serialport/terminal/main.cpp
index e3565190..e3565190 100644
--- a/examples/terminal/main.cpp
+++ b/examples/serialport/terminal/main.cpp
diff --git a/examples/terminal/mainwindow.cpp b/examples/serialport/terminal/mainwindow.cpp
index 47864a25..47864a25 100644
--- a/examples/terminal/mainwindow.cpp
+++ b/examples/serialport/terminal/mainwindow.cpp
diff --git a/examples/terminal/mainwindow.h b/examples/serialport/terminal/mainwindow.h
index 1be7f893..1be7f893 100644
--- a/examples/terminal/mainwindow.h
+++ b/examples/serialport/terminal/mainwindow.h
diff --git a/examples/terminal/mainwindow.ui b/examples/serialport/terminal/mainwindow.ui
index 452fdd53..452fdd53 100644
--- a/examples/terminal/mainwindow.ui
+++ b/examples/serialport/terminal/mainwindow.ui
diff --git a/examples/terminal/settingsdialog.cpp b/examples/serialport/terminal/settingsdialog.cpp
index 65f6b87c..65f6b87c 100644
--- a/examples/terminal/settingsdialog.cpp
+++ b/examples/serialport/terminal/settingsdialog.cpp
diff --git a/examples/terminal/settingsdialog.h b/examples/serialport/terminal/settingsdialog.h
index ff8f8b67..ff8f8b67 100644
--- a/examples/terminal/settingsdialog.h
+++ b/examples/serialport/terminal/settingsdialog.h
diff --git a/examples/terminal/settingsdialog.ui b/examples/serialport/terminal/settingsdialog.ui
index 28c1211a..28c1211a 100644
--- a/examples/terminal/settingsdialog.ui
+++ b/examples/serialport/terminal/settingsdialog.ui
diff --git a/examples/terminal/terminal.pro b/examples/serialport/terminal/terminal.pro
index 0a5b545a..0a5b545a 100644
--- a/examples/terminal/terminal.pro
+++ b/examples/serialport/terminal/terminal.pro
diff --git a/examples/terminal/terminal.qrc b/examples/serialport/terminal/terminal.qrc
index 0b498794..0b498794 100644
--- a/examples/terminal/terminal.qrc
+++ b/examples/serialport/terminal/terminal.qrc
diff --git a/src/serialport/doc/qtserialport.qdocconf b/src/serialport/doc/qtserialport.qdocconf
index 9db6c3c5..cf7c0613 100644
--- a/src/serialport/doc/qtserialport.qdocconf
+++ b/src/serialport/doc/qtserialport.qdocconf
@@ -36,7 +36,7 @@ qhp.QtSerialPort.subprojects.examples.sortPages = true
 
 headerdirs  += ..
 sourcedirs  += ..
-exampledirs += ../../../examples
+exampledirs += ../../../examples/serialport
 imagedirs   += images
 
 depends += qtcore qtdoc