diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-12-08 16:42:09 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-15 15:13:04 +0000 |
| commit | 82cb01213be6c539d46fb3cc5cf14c3133aef01d (patch) | |
| tree | 0b11dc94d4fe4f78079fe05a74b7e2b3032138ad /examples/widgets/draganddrop | |
| parent | e06df5d17a4bb0150fffd327449b7a278114b3fa (diff) | |
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>
Diffstat (limited to 'examples/widgets/draganddrop')
6 files changed, 6 insertions, 18 deletions
diff --git a/examples/widgets/draganddrop/CMakeLists.txt b/examples/widgets/draganddrop/CMakeLists.txt index 87ba702aca..c7d8d068d6 100644 --- a/examples/widgets/draganddrop/CMakeLists.txt +++ b/examples/widgets/draganddrop/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from draganddrop.pro. - qt_internal_add_example(draggableicons) qt_internal_add_example(draggabletext) qt_internal_add_example(dropsite) diff --git a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt index c6ebe53749..ee157bbf25 100644 --- a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from draggableicons.pro. - cmake_minimum_required(VERSION 3.16) project(draggableicons LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt index 0ae6758d41..7aba6ac56c 100644 --- a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from draggabletext.pro. - cmake_minimum_required(VERSION 3.16) project(draggabletext LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/dropsite/CMakeLists.txt b/examples/widgets/draganddrop/dropsite/CMakeLists.txt index 40244ab65c..a3a4d0fbe8 100644 --- a/examples/widgets/draganddrop/dropsite/CMakeLists.txt +++ b/examples/widgets/draganddrop/dropsite/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dropsite.pro. - cmake_minimum_required(VERSION 3.16) project(dropsite LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt index eef163b682..2f2087fd3d 100644 --- a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt +++ b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from fridgemagnets.pro. - cmake_minimum_required(VERSION 3.16) project(fridgemagnets LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt index 9cb2a85437..cf6350f16d 100644 --- a/examples/widgets/draganddrop/puzzle/CMakeLists.txt +++ b/examples/widgets/draganddrop/puzzle/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from puzzle.pro. - cmake_minimum_required(VERSION 3.16) project(puzzle LANGUAGES CXX) @@ -13,21 +11,21 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/draganddrop_puzzle") # special case +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/draganddrop_puzzle") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) -qt_add_executable(draganddrop_puzzle # special case: renamed puzzle +qt_add_executable(draganddrop_puzzle main.cpp mainwindow.cpp mainwindow.h pieceslist.cpp pieceslist.h puzzlewidget.cpp puzzlewidget.h ) -set_target_properties(draganddrop_puzzle PROPERTIES # special case +set_target_properties(draganddrop_puzzle PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(draganddrop_puzzle PUBLIC # special case +target_link_libraries(draganddrop_puzzle PUBLIC Qt::Core Qt::Gui Qt::Widgets @@ -39,14 +37,14 @@ set(puzzle_resource_files "example.jpg" ) -qt_add_resources(draganddrop_puzzle "puzzle" # special case +qt_add_resources(draganddrop_puzzle "puzzle" PREFIX "/images" FILES ${puzzle_resource_files} ) -install(TARGETS draganddrop_puzzle # special case: renamed puzzle +install(TARGETS draganddrop_puzzle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" |