Create a couple of CMakeLists and fix related cpps

Added a banch of CMakeLists to different folders.
In the qprocess folder deleted the unused QApplication and added
condition for windows.
In qstring, fixed some small bugs.
In qsignalmapper, added a condition to avoid naming problem

Task-number: QTBUG-137566
Change-Id: I63e04cdd01b5854ab5f2dac2a0c317eea35f5b42
Reviewed-by: Volker Hilsheimer <[email protected]>

9 files changed, 93 insertions, 13 deletions

diff --git a/src/corelib/doc/snippets/CMakeLists.txt b/src/corelib/doc/snippets/CMakeLists.txt
index 10bb0b5a444..4fda2ed54ea 100644
--- a/src/corelib/doc/snippets/CMakeLists.txt
+++ b/src/corelib/doc/snippets/CMakeLists.txt
@@ -71,3 +71,8 @@ if ("${CMAKE_CXX_COMPILE_FEATURES}" MATCHES "cxx_std_23")
 endif()
 
 set_target_properties(corelib_snippets PROPERTIES UNITY_BUILD OFF)
+
+add_subdirectory(eventfilters)
+add_subdirectory(qmetaobject-invokable)
+add_subdirectory(qmetaobject-revision)
+add_subdirectory(qprocess)
diff --git a/src/corelib/doc/snippets/eventfilters/CMakeLists.txt b/src/corelib/doc/snippets/eventfilters/CMakeLists.txt
new file mode 100644
index 00000000000..ea381e425a5
--- /dev/null
+++ b/src/corelib/doc/snippets/eventfilters/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_library(snippets_eventfilters OBJECT)
+
+target_link_libraries(snippets_eventfilters PRIVATE
+    Qt::Core
+)
+
+qt_internal_extend_target(snippets_eventfilters CONDITION QT_FEATURE_widgets
+    LIBRARIES
+        Qt::Widgets
+    SOURCE
+        main.cpp
+)
+
+qt_internal_extend_target(snippets_eventfilters CONDITION QT_FEATURE_gui
+    LIBRARIES
+        Qt::Gui
+    SOURCES
+        filterobject.cpp
+)
diff --git a/src/corelib/doc/snippets/qmetaobject-invokable/CMakeLists.txt b/src/corelib/doc/snippets/qmetaobject-invokable/CMakeLists.txt
new file mode 100644
index 00000000000..76bb79951a3
--- /dev/null
+++ b/src/corelib/doc/snippets/qmetaobject-invokable/CMakeLists.txt
@@ -0,0 +1,17 @@
+if(NOT QT_FEATURE_widgets)
+    return()
+endif()
+
+add_library(snippets_qmetaobject-invokable OBJECT)
+
+target_link_libraries(snippets_qmetaobject-invokable PRIVATE
+    Qt::Core
+)
+
+qt_internal_extend_target(snippets_qmetaobject-invokable CONDITION QT_FEATURE_widgets
+    LIBRARIES
+        Qt::Widgets
+    SOURCES
+        main.cpp
+        window.cpp
+)
diff --git a/src/corelib/doc/snippets/qmetaobject-revision/CMakeLists.txt b/src/corelib/doc/snippets/qmetaobject-revision/CMakeLists.txt
new file mode 100644
index 00000000000..0cadf9380b1
--- /dev/null
+++ b/src/corelib/doc/snippets/qmetaobject-revision/CMakeLists.txt
@@ -0,0 +1,17 @@
+if(NOT QT_FEATURE_widgets)
+    return()
+endif()
+
+add_library(snippets_qmetaobject-revision OBJECT)
+
+target_link_libraries(snippets_qmetaobject-revision PRIVATE
+    Qt::Core
+)
+
+qt_internal_extend_target(snippets_qmetaobject-revision CONDITION QT_FEATURE_widgets
+    LIBRARIES
+        Qt::Widgets
+    SOURCES
+        main.cpp
+        window.cpp
+)
diff --git a/src/corelib/doc/snippets/qprocess/CMakeLists.txt b/src/corelib/doc/snippets/qprocess/CMakeLists.txt
new file mode 100644
index 00000000000..07b66d0b36b
--- /dev/null
+++ b/src/corelib/doc/snippets/qprocess/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_library(snippets_qprocess OBJECT
+    qprocess-createprocessargumentsmodifier.cpp
+    qprocess-simpleexecution.cpp
+)
+
+target_link_libraries(snippets_qprocess PRIVATE
+    Qt::Core
+)
diff --git a/src/corelib/doc/snippets/qprocess/qprocess-createprocessargumentsmodifier.cpp b/src/corelib/doc/snippets/qprocess/qprocess-createprocessargumentsmodifier.cpp
index b084e99abda..10a89462e03 100644
--- a/src/corelib/doc/snippets/qprocess/qprocess-createprocessargumentsmodifier.cpp
+++ b/src/corelib/doc/snippets/qprocess/qprocess-createprocessargumentsmodifier.cpp
@@ -1,14 +1,14 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-#include <QCoreApplication>
 #include <QProcess>
-#include <qt_windows.h>
+#include <QtCore/qglobal.h>
+
+#ifdef Q_OS_WIN
+#include <QtCore/qt_windows.h>
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication app(argc, argv);
-
 //! [0]
     QProcess process;
     process.setCreateProcessArgumentsModifier([] (QProcess::CreateProcessArguments *args)
@@ -21,6 +21,5 @@ int main(int argc, char *argv[])
     });
     process.start("C:\\Windows\\System32\\cmd.exe", QStringList() << "/k" << "title" << "The Child Process");
 //! [0]
-
-    return app.exec();
 }
+#endif
diff --git a/src/corelib/doc/snippets/qprocess/qprocess-simpleexecution.cpp b/src/corelib/doc/snippets/qprocess/qprocess-simpleexecution.cpp
index 0715108754d..65e642d9853 100644
--- a/src/corelib/doc/snippets/qprocess/qprocess-simpleexecution.cpp
+++ b/src/corelib/doc/snippets/qprocess/qprocess-simpleexecution.cpp
@@ -1,16 +1,13 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-#include <QApplication>
-#include <QtGui>
+#include <QtCore>
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
 //! [0]
     QObject *parent;
 //! [0]
-    parent = &app;
 
 //! [1]
     QString program = "./path/to/Qt/examples/widgets/analogclock";
@@ -24,6 +21,4 @@ int main(int argc, char *argv[])
     QProcess *myProcess = new QProcess(parent);
     myProcess->start(program, arguments);
 //! [2]
-
-    return app.exec();
 }
diff --git a/src/corelib/doc/snippets/qsignalmapper/CMakeLists.txt b/src/corelib/doc/snippets/qsignalmapper/CMakeLists.txt
new file mode 100644
index 00000000000..086ddbf9c5e
--- /dev/null
+++ b/src/corelib/doc/snippets/qsignalmapper/CMakeLists.txt
@@ -0,0 +1,18 @@
+if(NOT TARGET Qt::Widgets)
+    return()
+endif()
+
+add_library(snippets_qsignalmapper OBJECT
+    buttonwidget.cpp
+)
+
+add_compile_definitions(EXAMPLE_ONE)
+
+target_link_libraries(snippets_qsignalmapper PRIVATE
+    Qt::Core
+)
+
+qt_internal_extend_target(snippets_qsignalmapper CONDITION QT_FEATURE_widgets
+    LIBRARIES
+        Qt::Widgets
+)
diff --git a/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp b/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp
index e2e97fa11c0..1f9e53f1385 100644
--- a/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp
+++ b/src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp
@@ -5,6 +5,7 @@
 
 #include <QtWidgets>
 
+#ifdef EXAMPLE_ONE
 //! [0]
 ButtonWidget::ButtonWidget(const QStringList &texts, QWidget *parent)
     : QWidget(parent)
@@ -25,7 +26,7 @@ ButtonWidget::ButtonWidget(const QStringList &texts, QWidget *parent)
             this, &ButtonWidget::clicked);
 }
 //! [2]
-
+#else
 //! [3]
 ButtonWidget::ButtonWidget(const QStringList &texts, QWidget *parent)
     : QWidget(parent)
@@ -39,3 +40,4 @@ ButtonWidget::ButtonWidget(const QStringList &texts, QWidget *parent)
     }
 }
 //! [3]
+#endif