Examples: Remove duplicated Qt6::PrintSupport link information

Some CMakeLists.txt files did link to Qt6::PrintSupport twice. Also unify formatting and order of the linker step. Change-Id: I4af935c5dc3de6c243aad8511b0803ceaa872589 Reviewed-by: Jörg Bornemann <[email protected]>
leadtobetter · Nov 30, 2022 · d221ea6 · d221ea6
1 parent de7287b
commit d221ea6
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 57 deletions.
diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt
@@ -53,9 +53,7 @@ qt_add_resources(chip "images"
 )
 
 if(TARGET Qt6::PrintSupport)
-    target_link_libraries(chip PUBLIC
-        Qt6::PrintSupport
-    )
+    target_link_libraries(chip PUBLIC Qt6::PrintSupport)
 endif()
 
 install(TARGETS chip

diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt
@@ -35,6 +35,10 @@ target_link_libraries(pixelator PUBLIC
     Qt6::Widgets
 )
 
+if(TARGET Qt6::PrintSupport)
+    target_link_libraries(pixelator PUBLIC Qt6::PrintSupport)
+endif()
+
 # Resources:
 set(images_resource_files
     "images/qt.png"
@@ -47,12 +51,6 @@ qt_add_resources(pixelator "images"
         ${images_resource_files}
 )
 
-if(TARGET Qt6::PrintSupport)
-    target_link_libraries(pixelator PUBLIC
-        Qt6::PrintSupport
-    )
-endif()
-
 install(TARGETS pixelator
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
@@ -52,12 +52,6 @@ qt_add_resources(spreadsheet "spreadsheet"
         ${spreadsheet_resource_files}
 )
 
-if(TARGET Qt6::PrintSupport)
-    target_link_libraries(spreadsheet PUBLIC
-        Qt6::PrintSupport
-    )
-endif()
-
 install(TARGETS spreadsheet
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

diff --git a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt
@@ -52,12 +52,6 @@ qt_add_resources(dockwidgets "dockwidgets"
         ${dockwidgets_resource_files}
 )
 
-if(TARGET Qt6::PrintSupport)
-    target_link_libraries(dockwidgets PUBLIC
-        Qt6::PrintSupport
-    )
-endif()
-
 install(TARGETS dockwidgets
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/examples/widgets/painting/fontsampler/CMakeLists.txt
@@ -35,9 +35,7 @@ target_link_libraries(fontsampler PUBLIC
 )
 
 if(TARGET Qt6::PrintSupport)
-    target_link_libraries(fontsampler PUBLIC
-        Qt6::PrintSupport
-    )
+    target_link_libraries(fontsampler PUBLIC Qt6::PrintSupport)
 endif()
 
 install(TARGETS fontsampler

diff --git a/examples/widgets/richtext/orderform/CMakeLists.txt b/examples/widgets/richtext/orderform/CMakeLists.txt
@@ -32,9 +32,7 @@ target_link_libraries(orderform PUBLIC
 )
 
 if(TARGET Qt6::PrintSupport)
-    target_link_libraries(orderform PUBLIC
-        Qt6::PrintSupport
-    )
+    target_link_libraries(orderform PUBLIC Qt6::PrintSupport)
 endif()
 
 install(TARGETS orderform

diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/examples/widgets/richtext/textedit/CMakeLists.txt
@@ -98,12 +98,6 @@ qt_add_resources(textedit "textedit"
         ${textedit_resource_files}
 )
 
-if(TARGET Qt6::PrintSupport)
-    target_link_libraries(textedit PUBLIC
-        Qt6::PrintSupport
-    )
-endif()
-
 install(TARGETS textedit
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

diff --git a/examples/widgets/touch/fingerpaint/CMakeLists.txt b/examples/widgets/touch/fingerpaint/CMakeLists.txt
@@ -38,12 +38,6 @@ if (TARGET Qt6::PrintSupport)
     target_link_libraries(fingerpaint PUBLIC Qt6::PrintSupport)
 endif()
 
-if(TARGET Qt6::PrintSupport)
-    target_link_libraries(fingerpaint PUBLIC
-        Qt6::PrintSupport
-    )
-endif()
-
 install(TARGETS fingerpaint
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt
@@ -33,6 +33,10 @@ target_link_libraries(notepad PUBLIC
     Qt6::Widgets
 )
 
+if(TARGET Qt6::PrintSupport)
+    target_link_libraries(notepad PUBLIC Qt6::PrintSupport)
+endif()
+
 # Resources:
 set(notepad_resource_files
     "images/bold.png"
@@ -62,12 +66,6 @@ qt_add_resources(notepad "notepad"
         ${notepad_resource_files}
 )
 
-if(TARGET Qt6::PrintSupport)
-    target_link_libraries(notepad PUBLIC
-        Qt6::PrintSupport
-    )
-endif()
-
 install(TARGETS notepad
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

diff --git a/examples/widgets/widgets/imageviewer/CMakeLists.txt b/examples/widgets/widgets/imageviewer/CMakeLists.txt
@@ -37,12 +37,6 @@ if (TARGET Qt6::PrintSupport)
     target_link_libraries(imageviewer PUBLIC Qt6::PrintSupport)
 endif()
 
-if(TARGET Qt6::PrintSupport)
-    target_link_libraries(imageviewer PUBLIC
-        Qt6::PrintSupport
-    )
-endif()
-
 install(TARGETS imageviewer
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

diff --git a/examples/widgets/widgets/scribble/CMakeLists.txt b/examples/widgets/widgets/scribble/CMakeLists.txt
@@ -38,12 +38,6 @@ if (TARGET Qt6::PrintSupport)
     target_link_libraries(scribble PUBLIC Qt6::PrintSupport)
 endif()
 
-if(TARGET Qt6::PrintSupport)
-    target_link_libraries(scribble PUBLIC
-        Qt6::PrintSupport
-    )
-endif()
-
 install(TARGETS scribble
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"