2 files changed, 38 insertions, 31 deletions

diff --git a/src/gui/doc/snippets/CMakeLists.txt b/src/gui/doc/snippets/CMakeLists.txt
index b7e8e5a2784..e314d577d27 100644
--- a/src/gui/doc/snippets/CMakeLists.txt
+++ b/src/gui/doc/snippets/CMakeLists.txt
@@ -10,18 +10,21 @@ qt_add_library(gui_snippets OBJECT
     polygon/polygon.cpp
     qimagewriter/main.cpp
     qtextobject/textobjectinterface.h
+    rhioffscreen/main.cpp
     textdocument-end/textdocumentendsnippet.cpp
 )
 
 target_link_libraries(gui_snippets PRIVATE
     Qt::Core
     Qt::Gui
+    Qt::GuiPrivate
 )
 
-qt_internal_extend_target(gui_snippets CONDITION QT_FEATURE_widgets
-    LIBRARIES
+if(QT_FEATURE_widgets)
+    target_link_libraries(gui_snippets PRIVATE
         Qt::Widgets
-    SOURCES
+    )
+    target_sources(gui_snippets PRIVATE
         draganddrop/dragwidget.cpp
         dragging/mainwindow.cpp
         droparea/droparea.cpp
@@ -50,33 +53,33 @@ qt_internal_extend_target(gui_snippets CONDITION QT_FEATURE_widgets
         textdocument-tables/mainwindow.cpp
         textdocument-tables/mainwindow.cpp
         transform/main.cpp
-)
+    )
+endif()
 
-qt_internal_extend_target(gui_snippets
-    LIBRARIES
-        Qt::GuiPrivate
-    SOURCES
-        rhioffscreen/main.cpp
-)
 
-qt_internal_extend_target(gui_snippets CONDITION QT_FEATURE_xml
-    LIBRARIES
+if(QT_FEATURE_xml)
+    target_link_libraries(gui_snippets PRIVATE
         Qt::Xml
-    SOURCES
+    )
+    target_sources(gui_snippets PRIVATE
         textblock-fragments/xmlwriter.cpp
-)
+    )
+endif()
 
-qt_internal_extend_target(gui_snippets CONDITION QT_FEATURE_printsupport
-    LIBRARIES
+if(QT_FEATURE_printsupport)
+    target_link_libraries(gui_snippets PRIVATE
         Qt::PrintSupport
-    SOURCES
+    )
+    target_sources(gui_snippets PRIVATE
         textdocument-printing/mainwindow.cpp
-)
+    )
+endif()
 
-qt_internal_extend_target(gui_snippets CONDITION QT_FEATURE_widgets AND QT_FEATURE_clipboard
-    SOURCES
+if(QT_FEATURE_widgets AND QT_FEATURE_clipboard)
+    target_sources(gui_snippets PRIVATE
         clipboard/clipwindow.cpp
-)
+    )
+endif()
 
 set_target_properties(gui_snippets PROPERTIES COMPILE_OPTIONS "-w")
 
diff --git a/src/gui/doc/snippets/code/CMakeLists.txt b/src/gui/doc/snippets/code/CMakeLists.txt
index 7f8897ec8fa..0db976f7c21 100644
--- a/src/gui/doc/snippets/code/CMakeLists.txt
+++ b/src/gui/doc/snippets/code/CMakeLists.txt
@@ -36,10 +36,11 @@ target_link_libraries(gui_snippets_code PRIVATE
     Qt::Gui
 )
 
-qt_internal_extend_target(gui_snippets_code CONDITION QT_FEATURE_widgets
-    LIBRARIES
+if(QT_FEATURE_widgets)
+    target_link_libraries(gui_snippets_code PRIVATE
         Qt::Widgets
-    SOURCES
+    )
+    target_sources(gui_snippets_code PRIVATE
         doc_src_coordsys.cpp
         doc_src_richtext.cpp
         src_gui_image_qicon.cpp
@@ -53,19 +54,22 @@ qt_internal_extend_target(gui_snippets_code CONDITION QT_FEATURE_widgets
         src_gui_painting_qpainter.cpp
         src_gui_text_qsyntaxhighlighter.cpp
         src_gui_util_qvalidator.cpp
-)
+    )
+endif()
 
-qt_internal_extend_target(gui_snippets_code CONDITION QT_FEATURE_vulkan
-    SOURCES
+if(QT_FEATURE_vulkan)
+    target_sources(gui_snippets_code PRIVATE
         src_gui_vulkan_qvulkanfunctions.cpp
         src_gui_vulkan_qvulkaninstance.cpp
         src_gui_vulkan_qvulkanwindow.cpp
-)
+    )
+endif()
 
-qt_internal_extend_target(gui_snippets_code CONDITION QT_FEATURE_clipboard
-    SOURCES
+if(QT_FEATURE_clipboard)
+    target_sources(gui_snippets_code PRIVATE
         src_gui_kernel_qclipboard.cpp
-)
+    )
+endif()
 
 set_target_properties(gui_snippets_code PROPERTIES COMPILE_OPTIONS "-w")