From 51f22a3a0495d8418a5d6dd0f09771c0347441b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 8 Dec 2021 16:42:09 +0100 Subject: Examples: Remove remaining conversion markers in CMakeLists.txt Pick-to: 6.3 Change-Id: Ia5d474a3efd6aadbd0ef1537318f2f24e6c24fee Reviewed-by: Alexandru Croitor --- examples/widgets/widgets/CMakeLists.txt | 2 -- examples/widgets/widgets/analogclock/CMakeLists.txt | 2 -- examples/widgets/widgets/calculator/CMakeLists.txt | 2 -- examples/widgets/widgets/calendarwidget/CMakeLists.txt | 2 -- examples/widgets/widgets/charactermap/CMakeLists.txt | 2 -- examples/widgets/widgets/codeeditor/CMakeLists.txt | 2 -- examples/widgets/widgets/digitalclock/CMakeLists.txt | 2 -- examples/widgets/widgets/elidedlabel/CMakeLists.txt | 2 -- examples/widgets/widgets/groupbox/CMakeLists.txt | 2 -- examples/widgets/widgets/icons/CMakeLists.txt | 4 +--- examples/widgets/widgets/imageviewer/CMakeLists.txt | 5 +---- examples/widgets/widgets/lineedits/CMakeLists.txt | 2 -- examples/widgets/widgets/mousebuttons/CMakeLists.txt | 2 -- examples/widgets/widgets/movie/CMakeLists.txt | 2 -- examples/widgets/widgets/scribble/CMakeLists.txt | 5 +---- examples/widgets/widgets/shapedclock/CMakeLists.txt | 2 -- examples/widgets/widgets/sliders/CMakeLists.txt | 2 -- examples/widgets/widgets/spinboxes/CMakeLists.txt | 2 -- examples/widgets/widgets/styles/CMakeLists.txt | 2 -- examples/widgets/widgets/stylesheet/CMakeLists.txt | 2 -- examples/widgets/widgets/tablet/CMakeLists.txt | 2 -- examples/widgets/widgets/tetrix/CMakeLists.txt | 2 -- examples/widgets/widgets/tooltips/CMakeLists.txt | 2 -- examples/widgets/widgets/validators/CMakeLists.txt | 2 -- examples/widgets/widgets/wiggly/CMakeLists.txt | 2 -- examples/widgets/widgets/windowflags/CMakeLists.txt | 2 -- 26 files changed, 3 insertions(+), 57 deletions(-) (limited to 'examples/widgets/widgets') diff --git a/examples/widgets/widgets/CMakeLists.txt b/examples/widgets/widgets/CMakeLists.txt index 34d3d28b67..25912d2ec0 100644 --- a/examples/widgets/widgets/CMakeLists.txt +++ b/examples/widgets/widgets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from widgets.pro. - qt_internal_add_example(analogclock) qt_internal_add_example(calculator) qt_internal_add_example(calendarwidget) diff --git a/examples/widgets/widgets/analogclock/CMakeLists.txt b/examples/widgets/widgets/analogclock/CMakeLists.txt index f972359e1a..b775b23485 100644 --- a/examples/widgets/widgets/analogclock/CMakeLists.txt +++ b/examples/widgets/widgets/analogclock/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from analogclock.pro. - cmake_minimum_required(VERSION 3.16) project(analogclock LANGUAGES CXX) diff --git a/examples/widgets/widgets/calculator/CMakeLists.txt b/examples/widgets/widgets/calculator/CMakeLists.txt index 7332c3b5ca..419e4e3bd1 100644 --- a/examples/widgets/widgets/calculator/CMakeLists.txt +++ b/examples/widgets/widgets/calculator/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from calculator.pro. - cmake_minimum_required(VERSION 3.16) project(calculator LANGUAGES CXX) diff --git a/examples/widgets/widgets/calendarwidget/CMakeLists.txt b/examples/widgets/widgets/calendarwidget/CMakeLists.txt index f95f2f9131..b1ee4577f1 100644 --- a/examples/widgets/widgets/calendarwidget/CMakeLists.txt +++ b/examples/widgets/widgets/calendarwidget/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from calendarwidget.pro. - cmake_minimum_required(VERSION 3.16) project(calendarwidget LANGUAGES CXX) diff --git a/examples/widgets/widgets/charactermap/CMakeLists.txt b/examples/widgets/widgets/charactermap/CMakeLists.txt index 4bb71104dd..65956f7afd 100644 --- a/examples/widgets/widgets/charactermap/CMakeLists.txt +++ b/examples/widgets/widgets/charactermap/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from charactermap.pro. - cmake_minimum_required(VERSION 3.16) project(charactermap LANGUAGES CXX) diff --git a/examples/widgets/widgets/codeeditor/CMakeLists.txt b/examples/widgets/widgets/codeeditor/CMakeLists.txt index f5c843933b..9eb4f1a8bd 100644 --- a/examples/widgets/widgets/codeeditor/CMakeLists.txt +++ b/examples/widgets/widgets/codeeditor/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from codeeditor.pro. - cmake_minimum_required(VERSION 3.16) project(codeeditor LANGUAGES CXX) diff --git a/examples/widgets/widgets/digitalclock/CMakeLists.txt b/examples/widgets/widgets/digitalclock/CMakeLists.txt index 684da7f24d..e2e1c4a1e3 100644 --- a/examples/widgets/widgets/digitalclock/CMakeLists.txt +++ b/examples/widgets/widgets/digitalclock/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from digitalclock.pro. - cmake_minimum_required(VERSION 3.16) project(digitalclock LANGUAGES CXX) diff --git a/examples/widgets/widgets/elidedlabel/CMakeLists.txt b/examples/widgets/widgets/elidedlabel/CMakeLists.txt index e6b0a02c1b..feb46d9720 100644 --- a/examples/widgets/widgets/elidedlabel/CMakeLists.txt +++ b/examples/widgets/widgets/elidedlabel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from elidedlabel.pro. - cmake_minimum_required(VERSION 3.16) project(elidedlabel LANGUAGES CXX) diff --git a/examples/widgets/widgets/groupbox/CMakeLists.txt b/examples/widgets/widgets/groupbox/CMakeLists.txt index 313d71b6fd..9108a0a868 100644 --- a/examples/widgets/widgets/groupbox/CMakeLists.txt +++ b/examples/widgets/widgets/groupbox/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from groupbox.pro. - cmake_minimum_required(VERSION 3.16) project(groupbox LANGUAGES CXX) diff --git a/examples/widgets/widgets/icons/CMakeLists.txt b/examples/widgets/widgets/icons/CMakeLists.txt index 07ec4174a0..52a59c1d3d 100644 --- a/examples/widgets/widgets/icons/CMakeLists.txt +++ b/examples/widgets/widgets/icons/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from icons.pro. - cmake_minimum_required(VERSION 3.16) project(icons LANGUAGES CXX) @@ -29,7 +27,7 @@ set_target_properties(icons PROPERTIES MACOSX_BUNDLE TRUE ) target_compile_definitions(icons PUBLIC - SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" # special case + SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" ) target_link_libraries(icons PUBLIC diff --git a/examples/widgets/widgets/imageviewer/CMakeLists.txt b/examples/widgets/widgets/imageviewer/CMakeLists.txt index 650a467108..96b782b0cd 100644 --- a/examples/widgets/widgets/imageviewer/CMakeLists.txt +++ b/examples/widgets/widgets/imageviewer/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from imageviewer.pro. - cmake_minimum_required(VERSION 3.16) project(imageviewer LANGUAGES CXX) @@ -33,11 +31,10 @@ target_link_libraries(imageviewer PUBLIC Qt::Gui Qt::Widgets ) -# special case begin + if (TARGET Qt::PrintSupport) target_link_libraries(imageviewer PUBLIC Qt::PrintSupport) endif() -# special case end if(TARGET Qt::PrintSupport) target_link_libraries(imageviewer PUBLIC diff --git a/examples/widgets/widgets/lineedits/CMakeLists.txt b/examples/widgets/widgets/lineedits/CMakeLists.txt index f5c127d297..7cc503cdfc 100644 --- a/examples/widgets/widgets/lineedits/CMakeLists.txt +++ b/examples/widgets/widgets/lineedits/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from lineedits.pro. - cmake_minimum_required(VERSION 3.16) project(lineedits LANGUAGES CXX) diff --git a/examples/widgets/widgets/mousebuttons/CMakeLists.txt b/examples/widgets/widgets/mousebuttons/CMakeLists.txt index df186c8d61..8083642320 100644 --- a/examples/widgets/widgets/mousebuttons/CMakeLists.txt +++ b/examples/widgets/widgets/mousebuttons/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from mousebuttons.pro. - cmake_minimum_required(VERSION 3.16) project(mousebuttons LANGUAGES CXX) diff --git a/examples/widgets/widgets/movie/CMakeLists.txt b/examples/widgets/widgets/movie/CMakeLists.txt index f16ac5fbcf..37ff633a6a 100644 --- a/examples/widgets/widgets/movie/CMakeLists.txt +++ b/examples/widgets/widgets/movie/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from movie.pro. - cmake_minimum_required(VERSION 3.16) project(movie LANGUAGES CXX) diff --git a/examples/widgets/widgets/scribble/CMakeLists.txt b/examples/widgets/widgets/scribble/CMakeLists.txt index b0ea465d55..92001b138f 100644 --- a/examples/widgets/widgets/scribble/CMakeLists.txt +++ b/examples/widgets/widgets/scribble/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from scribble.pro. - cmake_minimum_required(VERSION 3.16) project(scribble LANGUAGES CXX) @@ -34,11 +32,10 @@ target_link_libraries(scribble PUBLIC Qt::Gui Qt::Widgets ) -# special case begin + if (TARGET Qt::PrintSupport) target_link_libraries(scribble PUBLIC Qt::PrintSupport) endif() -# special case end if(TARGET Qt::PrintSupport) target_link_libraries(scribble PUBLIC diff --git a/examples/widgets/widgets/shapedclock/CMakeLists.txt b/examples/widgets/widgets/shapedclock/CMakeLists.txt index dc6b3f4105..5271bcf096 100644 --- a/examples/widgets/widgets/shapedclock/CMakeLists.txt +++ b/examples/widgets/widgets/shapedclock/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from shapedclock.pro. - cmake_minimum_required(VERSION 3.16) project(shapedclock LANGUAGES CXX) diff --git a/examples/widgets/widgets/sliders/CMakeLists.txt b/examples/widgets/widgets/sliders/CMakeLists.txt index 8598087289..8354eef6af 100644 --- a/examples/widgets/widgets/sliders/CMakeLists.txt +++ b/examples/widgets/widgets/sliders/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from sliders.pro. - cmake_minimum_required(VERSION 3.16) project(sliders LANGUAGES CXX) diff --git a/examples/widgets/widgets/spinboxes/CMakeLists.txt b/examples/widgets/widgets/spinboxes/CMakeLists.txt index 481530f910..bc38a8f360 100644 --- a/examples/widgets/widgets/spinboxes/CMakeLists.txt +++ b/examples/widgets/widgets/spinboxes/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from spinboxes.pro. - cmake_minimum_required(VERSION 3.16) project(spinboxes LANGUAGES CXX) diff --git a/examples/widgets/widgets/styles/CMakeLists.txt b/examples/widgets/widgets/styles/CMakeLists.txt index ac33b59b72..ca478eccaa 100644 --- a/examples/widgets/widgets/styles/CMakeLists.txt +++ b/examples/widgets/widgets/styles/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from styles.pro. - cmake_minimum_required(VERSION 3.16) project(styles LANGUAGES CXX) diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/examples/widgets/widgets/stylesheet/CMakeLists.txt index 63286c3e95..743859d5cb 100644 --- a/examples/widgets/widgets/stylesheet/CMakeLists.txt +++ b/examples/widgets/widgets/stylesheet/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from stylesheet.pro. - cmake_minimum_required(VERSION 3.16) project(stylesheet LANGUAGES CXX) diff --git a/examples/widgets/widgets/tablet/CMakeLists.txt b/examples/widgets/widgets/tablet/CMakeLists.txt index 233c5cb03c..f2faeef3f9 100644 --- a/examples/widgets/widgets/tablet/CMakeLists.txt +++ b/examples/widgets/widgets/tablet/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from tablet.pro. - cmake_minimum_required(VERSION 3.16) project(qttablet LANGUAGES CXX) diff --git a/examples/widgets/widgets/tetrix/CMakeLists.txt b/examples/widgets/widgets/tetrix/CMakeLists.txt index 04a48b337b..6e76e5c9f0 100644 --- a/examples/widgets/widgets/tetrix/CMakeLists.txt +++ b/examples/widgets/widgets/tetrix/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from tetrix.pro. - cmake_minimum_required(VERSION 3.16) project(tetrix LANGUAGES CXX) diff --git a/examples/widgets/widgets/tooltips/CMakeLists.txt b/examples/widgets/widgets/tooltips/CMakeLists.txt index 49291c48f7..8126e7eb06 100644 --- a/examples/widgets/widgets/tooltips/CMakeLists.txt +++ b/examples/widgets/widgets/tooltips/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from tooltips.pro. - cmake_minimum_required(VERSION 3.16) project(tooltips LANGUAGES CXX) diff --git a/examples/widgets/widgets/validators/CMakeLists.txt b/examples/widgets/widgets/validators/CMakeLists.txt index a14f210711..c6e9ea905f 100644 --- a/examples/widgets/widgets/validators/CMakeLists.txt +++ b/examples/widgets/widgets/validators/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from validators.pro. - cmake_minimum_required(VERSION 3.16) project(validators LANGUAGES CXX) diff --git a/examples/widgets/widgets/wiggly/CMakeLists.txt b/examples/widgets/widgets/wiggly/CMakeLists.txt index 41f29a804d..26bd8d14e8 100644 --- a/examples/widgets/widgets/wiggly/CMakeLists.txt +++ b/examples/widgets/widgets/wiggly/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from wiggly.pro. - cmake_minimum_required(VERSION 3.16) project(wiggly LANGUAGES CXX) diff --git a/examples/widgets/widgets/windowflags/CMakeLists.txt b/examples/widgets/widgets/windowflags/CMakeLists.txt index 513f1c7522..914bfd60eb 100644 --- a/examples/widgets/widgets/windowflags/CMakeLists.txt +++ b/examples/widgets/widgets/windowflags/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from windowflags.pro. - cmake_minimum_required(VERSION 3.16) project(windowflags LANGUAGES CXX) -- cgit v1.2.3