diff options
| -rw-r--r-- | tests/manual/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/manual/highdpi/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/manual/highdpi/dprgadget/CMakeLists.txt | 33 | ||||
| -rw-r--r-- | tests/manual/highdpi/highdpi.pro | 3 | ||||
| -rw-r--r-- | tests/manual/highdpi/kitchensink/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/manual/highdpi/pixelgadget/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | tests/manual/highdpi/screengadget/CMakeLists.txt | 34 |
7 files changed, 51 insertions, 64 deletions
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 182068e8e8..0a2776ebe3 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(filetest) # add_subdirectory(foreignwindows) # special case end add_subdirectory(gestures) -# add_subdirectory(highdpi) special case broken in dev +add_subdirectory(highdpi) add_subdirectory(inputmethodhints) add_subdirectory(keypadnavigation) #add_subdirectory(lance) # special case qgl.h missing diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt new file mode 100644 index 0000000000..35735a7453 --- /dev/null +++ b/tests/manual/highdpi/CMakeLists.txt @@ -0,0 +1,6 @@ +# Generated from highdpi.pro. + +add_subdirectory(dprgadget) +add_subdirectory(kitchensink) +add_subdirectory(pixelgadget) +add_subdirectory(screengadget) diff --git a/tests/manual/highdpi/dprgadget/CMakeLists.txt b/tests/manual/highdpi/dprgadget/CMakeLists.txt index 06f18fe7dd..f856d269bf 100644 --- a/tests/manual/highdpi/dprgadget/CMakeLists.txt +++ b/tests/manual/highdpi/dprgadget/CMakeLists.txt @@ -1,21 +1,14 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -# special case skip regeneration -cmake_minimum_required(VERSION 3.16) -project(dprgadget LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_add_executable(dprgadget - main.cpp +# Generated from dprgadget.pro. + +##################################################################### +## dprgadget Binary: +##################################################################### + +qt_internal_add_manual_test(dprgadget + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::GuiPrivate ) - -target_link_libraries(dprgadget PUBLIC - Qt::Core - Qt::Gui - Qt::GuiPrivate - Qt::Widgets -) - diff --git a/tests/manual/highdpi/highdpi.pro b/tests/manual/highdpi/highdpi.pro new file mode 100644 index 0000000000..fcf4a5f09e --- /dev/null +++ b/tests/manual/highdpi/highdpi.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +SUBDIRS = dprgadget kitchensink pixelgadget screengadget diff --git a/tests/manual/highdpi/kitchensink/CMakeLists.txt b/tests/manual/highdpi/kitchensink/CMakeLists.txt index eee5897087..b8dfa9be37 100644 --- a/tests/manual/highdpi/kitchensink/CMakeLists.txt +++ b/tests/manual/highdpi/kitchensink/CMakeLists.txt @@ -1,6 +1,3 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - # Generated from kitchensink.pro. ##################################################################### @@ -15,7 +12,7 @@ qt_internal_add_manual_test(kitchensink HAVE_SCREEN_BASE_DPI INCLUDE_DIRECTORIES . - LIBRARIES + PUBLIC_LIBRARIES Qt::Gui Qt::GuiPrivate Qt::Widgets diff --git a/tests/manual/highdpi/pixelgadget/CMakeLists.txt b/tests/manual/highdpi/pixelgadget/CMakeLists.txt index 2812e75e19..6785970852 100644 --- a/tests/manual/highdpi/pixelgadget/CMakeLists.txt +++ b/tests/manual/highdpi/pixelgadget/CMakeLists.txt @@ -1,20 +1,14 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -# special case skip regeneration -cmake_minimum_required(VERSION 3.16) -project(pixelgadget LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_add_executable(pixelgadget - main.cpp +# Generated from pixelgadget.pro. + +##################################################################### +## pixelgadget Binary: +##################################################################### + +qt_internal_add_manual_test(pixelgadget + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets ) - -target_link_libraries(pixelgadget PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets -) - diff --git a/tests/manual/highdpi/screengadget/CMakeLists.txt b/tests/manual/highdpi/screengadget/CMakeLists.txt index 67b6e6720f..94660dc805 100644 --- a/tests/manual/highdpi/screengadget/CMakeLists.txt +++ b/tests/manual/highdpi/screengadget/CMakeLists.txt @@ -1,21 +1,15 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -# special case skip regeneration -cmake_minimum_required(VERSION 3.16) -project(screengadget LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - -qt_add_executable(screengadget - main.cpp +# Generated from screengadget.pro. + +##################################################################### +## screengadget Binary: +##################################################################### + +qt_internal_add_manual_test(screengadget + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + Qt::GuiPrivate ) - -target_link_libraries(screengadget PUBLIC - Qt::Core - Qt::Gui - Qt::GuiPrivate - Qt::Widgets -) - |