Examples: Remove remaining conversion markers in CMakeLists.txt

Change-Id: Ia5d474a3efd6aadbd0ef1537318f2f24e6c24fee
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 51f22a3a0495d8418a5d6dd0f09771c0347441b9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

13 files changed, 6 insertions, 64 deletions

diff --git a/examples/widgets/painting/CMakeLists.txt b/examples/widgets/painting/CMakeLists.txt
index 40ebafdc31..35f3af71b5 100644
--- a/examples/widgets/painting/CMakeLists.txt
+++ b/examples/widgets/painting/CMakeLists.txt
@@ -1,10 +1,7 @@
-# Generated from painting.pro.
-
-#add_subdirectory(shared) # special case pulled in by other subdirs as needed
 qt_internal_add_example(basicdrawing)
 qt_internal_add_example(concentriccircles)
 qt_internal_add_example(affine)
-# qt_internal_add_example(composition) # special case FIXME: Seems buggy wrt. usesOpenGL function
+# qt_internal_add_example(composition) # FIXME: Seems buggy wrt. usesOpenGL function
 qt_internal_add_example(deform)
 qt_internal_add_example(gradients)
 qt_internal_add_example(pathstroke)
diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt
index dbc38202c2..88792be8f0 100644
--- a/examples/widgets/painting/affine/CMakeLists.txt
+++ b/examples/widgets/painting/affine/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from affine.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(affine LANGUAGES CXX)
 
@@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/affine")
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
 qt_add_executable(affine
-    # special case begin
     # remove files from ../shared
     #../shared/arthurstyle.cpp ../shared/arthurstyle.h
     #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
     #../shared/hoverpoints.cpp ../shared/hoverpoints.h
-    # special case end
     main.cpp
     xform.cpp xform.h
 )
@@ -35,17 +31,15 @@ target_include_directories(affine PUBLIC
     ../shared
 )
 
-# special case begin
 if(NOT TARGET painting_shared::painting_shared)
     include(../shared/use_lib.cmake)
 endif()
-# special case end
 
 target_link_libraries(affine PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Widgets
-    painting_shared::painting_shared # special case
+    painting_shared::painting_shared
 )
 
 
@@ -109,7 +103,6 @@ qt_add_resources(affine "affine"
         ${affine_resource_files}
 )
 
-# special case begin
 # remove files from ../shared
 #if(QT_FEATURE_opengl)
     #target_sources(affine PUBLIC
@@ -120,7 +113,6 @@ qt_add_resources(affine "affine"
         #Qt::OpenGL
     #)
 #endif()
-# special case end
 
 install(TARGETS affine
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/painting/basicdrawing/CMakeLists.txt b/examples/widgets/painting/basicdrawing/CMakeLists.txt
index a4778edbc1..83faca559e 100644
--- a/examples/widgets/painting/basicdrawing/CMakeLists.txt
+++ b/examples/widgets/painting/basicdrawing/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from basicdrawing.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(basicdrawing LANGUAGES CXX)
 
diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt
index 3e48a688fa..62156d45e4 100644
--- a/examples/widgets/painting/composition/CMakeLists.txt
+++ b/examples/widgets/painting/composition/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from composition.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(composition LANGUAGES CXX)
 
@@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/composition")
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
 qt_add_executable(composition
-    # special case begin
     # remove files from ../shared
     #../shared/arthurstyle.cpp ../shared/arthurstyle.h
     #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
     #../shared/hoverpoints.cpp ../shared/hoverpoints.h
-    # special case end
     composition.cpp composition.h
     main.cpp
 )
@@ -35,17 +31,15 @@ target_include_directories(composition PUBLIC
     ../shared
 )
 
-# special case begin
 if(NOT TARGET painting_shared::painting_shared)
     include(../shared/use_lib.cmake)
 endif()
-# special case end
 
 target_link_libraries(composition PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Widgets
-    painting_shared::painting_shared # special case
+    painting_shared::painting_shared
 )
 
 
@@ -110,7 +104,6 @@ qt_add_resources(composition "composition"
         ${composition_resource_files}
 )
 
-# special case begin
 # remove files from ../shared
 #if(QT_FEATURE_opengl)
     #target_sources(affine PUBLIC
@@ -121,7 +114,6 @@ qt_add_resources(composition "composition"
         #Qt::OpenGL
     #)
 #endif()
-# special case end
 
 install(TARGETS composition
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/painting/concentriccircles/CMakeLists.txt b/examples/widgets/painting/concentriccircles/CMakeLists.txt
index 7bc7b44deb..72ed7d8776 100644
--- a/examples/widgets/painting/concentriccircles/CMakeLists.txt
+++ b/examples/widgets/painting/concentriccircles/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from concentriccircles.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(concentriccircles LANGUAGES CXX)
 
diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt
index feadb84a6a..1174cf5a27 100644
--- a/examples/widgets/painting/deform/CMakeLists.txt
+++ b/examples/widgets/painting/deform/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from deform.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(deform LANGUAGES CXX)
 
@@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/deform")
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
 qt_add_executable(deform
-    # special case begin
     # remove files from ../shared
     #../shared/arthurstyle.cpp ../shared/arthurstyle.h
     #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
     #../shared/hoverpoints.cpp ../shared/hoverpoints.h
-    # special case end
     main.cpp
     pathdeform.cpp pathdeform.h
 )
@@ -35,17 +31,15 @@ target_include_directories(deform PUBLIC
     ../shared
 )
 
-# special case begin
 if(NOT TARGET painting_shared::painting_shared)
     include(../shared/use_lib.cmake)
 endif()
-# special case end
 
 target_link_libraries(deform PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Widgets
-    painting_shared::painting_shared # special case
+    painting_shared::painting_shared
 )
 
 
@@ -108,7 +102,6 @@ qt_add_resources(deform "deform"
         ${deform_resource_files}
 )
 
-# special case begin
 # remove files from ../shared
 #if(QT_FEATURE_opengl)
     #target_sources(affine PUBLIC
@@ -119,7 +112,6 @@ qt_add_resources(deform "deform"
         #Qt::OpenGL
     #)
 #endif()
-# special case end
 
 install(TARGETS deform
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/examples/widgets/painting/fontsampler/CMakeLists.txt
index cb04d523bd..e0b683ba33 100644
--- a/examples/widgets/painting/fontsampler/CMakeLists.txt
+++ b/examples/widgets/painting/fontsampler/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from fontsampler.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(fontsampler LANGUAGES CXX)
 
diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt
index 62dca0045d..6de1d3c47e 100644
--- a/examples/widgets/painting/gradients/CMakeLists.txt
+++ b/examples/widgets/painting/gradients/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from gradients.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(gradients LANGUAGES CXX)
 
@@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/gradients")
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
 qt_add_executable(gradients
-    # special case begin
     # remove files from ../shared
     #../shared/arthurstyle.cpp ../shared/arthurstyle.h
     #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
     #../shared/hoverpoints.cpp ../shared/hoverpoints.h
-    # special case end
     gradients.cpp gradients.h
     main.cpp
 )
@@ -35,17 +31,15 @@ target_include_directories(gradients PUBLIC
     ../shared
 )
 
-# special case begin
 if(NOT TARGET painting_shared::painting_shared)
     include(../shared/use_lib.cmake)
 endif()
-# special case end
 
 target_link_libraries(gradients PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Widgets
-    painting_shared::painting_shared # special case
+    painting_shared::painting_shared
 )
 
 
@@ -108,7 +102,6 @@ qt_add_resources(gradients "gradients"
         ${gradients_resource_files}
 )
 
-# special case begin
 # remove files from ../shared
 #if(QT_FEATURE_opengl)
     #target_sources(affine PUBLIC
@@ -119,7 +112,6 @@ qt_add_resources(gradients "gradients"
         #Qt::OpenGL
     #)
 #endif()
-# special case end
 
 install(TARGETS gradients
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/painting/imagecomposition/CMakeLists.txt b/examples/widgets/painting/imagecomposition/CMakeLists.txt
index 4df69207f2..2887d84002 100644
--- a/examples/widgets/painting/imagecomposition/CMakeLists.txt
+++ b/examples/widgets/painting/imagecomposition/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from imagecomposition.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(imagecomposition LANGUAGES CXX)
 
diff --git a/examples/widgets/painting/painterpaths/CMakeLists.txt b/examples/widgets/painting/painterpaths/CMakeLists.txt
index 6e8492d8c3..f4530521dc 100644
--- a/examples/widgets/painting/painterpaths/CMakeLists.txt
+++ b/examples/widgets/painting/painterpaths/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from painterpaths.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(painterpaths LANGUAGES CXX)
 
diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt
index 8c84afcb6e..9e28706529 100644
--- a/examples/widgets/painting/pathstroke/CMakeLists.txt
+++ b/examples/widgets/painting/pathstroke/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from pathstroke.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(pathstroke LANGUAGES CXX)
 
@@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/pathstroke")
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 
 qt_add_executable(pathstroke
-    # special case begin
     # remove files from ../shared
     #../shared/arthurstyle.cpp ../shared/arthurstyle.h
     #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
     #../shared/hoverpoints.cpp ../shared/hoverpoints.h
-    # special case end
     main.cpp
     pathstroke.cpp pathstroke.h
 )
@@ -35,17 +31,15 @@ target_include_directories(pathstroke PUBLIC
     ../shared
 )
 
-# special case begin
 if(NOT TARGET painting_shared::painting_shared)
     include(../shared/use_lib.cmake)
 endif()
-# special case end
 
 target_link_libraries(pathstroke PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Widgets
-    painting_shared::painting_shared # special case
+    painting_shared::painting_shared
 )
 
 
@@ -108,7 +102,6 @@ qt_add_resources(pathstroke "pathstroke"
         ${pathstroke_resource_files}
 )
 
-# special case begin
 # remove files from ../shared
 #if(QT_FEATURE_opengl)
     #target_sources(affine PUBLIC
@@ -119,7 +112,6 @@ qt_add_resources(pathstroke "pathstroke"
         #Qt::OpenGL
     #)
 #endif()
-# special case end
 
 install(TARGETS pathstroke
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/painting/shared/CMakeLists.txt b/examples/widgets/painting/shared/CMakeLists.txt
index 0fc65d3d99..bd1b2ef5c6 100644
--- a/examples/widgets/painting/shared/CMakeLists.txt
+++ b/examples/widgets/painting/shared/CMakeLists.txt
@@ -1,6 +1,3 @@
-# special case skip regeneration
-# Port of shared.pri to be included by painting examples
-
 add_library(painting_shared OBJECT)
 add_library(painting_shared::painting_shared ALIAS painting_shared)
 qt6_wrap_cpp(moc_files arthurwidgets.h hoverpoints.h) # no automoc for OBJECT libs:-/
diff --git a/examples/widgets/painting/transformations/CMakeLists.txt b/examples/widgets/painting/transformations/CMakeLists.txt
index 20b6af6a63..990871318f 100644
--- a/examples/widgets/painting/transformations/CMakeLists.txt
+++ b/examples/widgets/painting/transformations/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from transformations.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(transformations LANGUAGES CXX)