summaryrefslogtreecommitdiffstats
path: root/tests/manual/highdpi
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual/highdpi')
-rw-r--r--tests/manual/highdpi/CMakeLists.txt7
-rw-r--r--tests/manual/highdpi/dprgadget/CMakeLists.txt34
-rw-r--r--tests/manual/highdpi/dprgadget/main.cpp3
-rw-r--r--tests/manual/highdpi/highdpi.pro3
-rw-r--r--tests/manual/highdpi/kitchensink/CMakeLists.txt10
-rw-r--r--tests/manual/highdpi/kitchensink/dragwidget.cpp8
-rw-r--r--tests/manual/highdpi/kitchensink/dragwidget.h2
-rw-r--r--tests/manual/highdpi/kitchensink/main.cpp4
-rw-r--r--tests/manual/highdpi/pixelgadget/CMakeLists.txt33
-rw-r--r--tests/manual/highdpi/pixelgadget/main.cpp2
-rw-r--r--tests/manual/highdpi/screengadget/CMakeLists.txt31
-rw-r--r--tests/manual/highdpi/screengadget/main.cpp2
12 files changed, 64 insertions, 75 deletions
diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt
new file mode 100644
index 0000000000..1d5d0ad1ff
--- /dev/null
+++ b/tests/manual/highdpi/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+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 39f4ac0b41..5cd0d5812e 100644
--- a/tests/manual/highdpi/dprgadget/CMakeLists.txt
+++ b/tests/manual/highdpi/dprgadget/CMakeLists.txt
@@ -1,21 +1,15 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-# 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
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## dprgadget Binary:
+#####################################################################
+
+qt_internal_add_manual_test(dprgadget
+ SOURCES
+ main.cpp
+ 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/dprgadget/main.cpp b/tests/manual/highdpi/dprgadget/main.cpp
index 9da74b4893..26a653e849 100644
--- a/tests/manual/highdpi/dprgadget/main.cpp
+++ b/tests/manual/highdpi/dprgadget/main.cpp
@@ -1,6 +1,7 @@
// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+#include <QtCore/qtversion.h>
#include <QtGui/qpa/qplatformscreen.h>
#include <QtGui/qpa/qplatformwindow.h>
#include <QtGui/private/qhighdpiscaling_p.h>
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 50ce06fa04..e7558c19e0 100644
--- a/tests/manual/highdpi/kitchensink/CMakeLists.txt
+++ b/tests/manual/highdpi/kitchensink/CMakeLists.txt
@@ -1,7 +1,5 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-# Generated from kitchensink.pro.
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## kitchensink Binary:
@@ -37,7 +35,3 @@ qt_internal_add_resource(kitchensink "kitchensink"
FILES
${kitchensink_resource_files}
)
-
-
-#### Keys ignored in scope 1:.:.:kitchensink.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/manual/highdpi/kitchensink/dragwidget.cpp b/tests/manual/highdpi/kitchensink/dragwidget.cpp
index 22393f0416..4088a56a80 100644
--- a/tests/manual/highdpi/kitchensink/dragwidget.cpp
+++ b/tests/manual/highdpi/kitchensink/dragwidget.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtWidgets>
#include "dragwidget.h"
@@ -84,8 +84,8 @@ void DragWidget::dropEvent(QDropEvent *event)
{
if (event->mimeData()->hasText()) {
const QMimeData *mime = event->mimeData();
- QStringList pieces = mime->text().split(QRegularExpression("\\s+"),
- Qt::SkipEmptyParts);
+ const QStringList pieces = mime->text().split(QRegularExpression("\\s+"),
+ Qt::SkipEmptyParts);
QPoint position = event->pos();
QPoint hotSpot;
@@ -98,7 +98,7 @@ void DragWidget::dropEvent(QDropEvent *event)
dropTimer.start(500, this);
update();
- foreach (QString piece, pieces) {
+ for (const QString &piece : pieces) {
FramedLabel *newLabel = new FramedLabel(piece, this);
newLabel->move(position - hotSpot);
newLabel->show();
diff --git a/tests/manual/highdpi/kitchensink/dragwidget.h b/tests/manual/highdpi/kitchensink/dragwidget.h
index e7b9ae1b6f..d444f7f0a6 100644
--- a/tests/manual/highdpi/kitchensink/dragwidget.h
+++ b/tests/manual/highdpi/kitchensink/dragwidget.h
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#ifndef DRAGWIDGET_H
#define DRAGWIDGET_H
diff --git a/tests/manual/highdpi/kitchensink/main.cpp b/tests/manual/highdpi/kitchensink/main.cpp
index 861707e6b9..5fe46828bd 100644
--- a/tests/manual/highdpi/kitchensink/main.cpp
+++ b/tests/manual/highdpi/kitchensink/main.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QMainWindow>
#include <QMenuBar>
@@ -1433,7 +1433,7 @@ int main(int argc, char **argv)
demoList << new DemoContainer<GraphicsViewCaching>("graphicsview", "Test QGraphicsView caching");
demoList << new DemoContainer<MetricsTest>("metrics", "Show screen metrics");
- for (DemoContainerBase *demo : qAsConst(demoList))
+ for (DemoContainerBase *demo : std::as_const(demoList))
parser.addOption(demo->option());
parser.process(app);
diff --git a/tests/manual/highdpi/pixelgadget/CMakeLists.txt b/tests/manual/highdpi/pixelgadget/CMakeLists.txt
index 7946d3de13..f808786b2a 100644
--- a/tests/manual/highdpi/pixelgadget/CMakeLists.txt
+++ b/tests/manual/highdpi/pixelgadget/CMakeLists.txt
@@ -1,20 +1,15 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-# 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
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## pixelgadget Binary:
+#####################################################################
+
+qt_internal_add_manual_test(pixelgadget
+ GUI
+ SOURCES
+ main.cpp
+ LIBRARIES
+ Qt::Gui
+ Qt::Widgets
)
-
-target_link_libraries(pixelgadget PUBLIC
- Qt::Core
- Qt::Gui
- Qt::Widgets
-)
-
diff --git a/tests/manual/highdpi/pixelgadget/main.cpp b/tests/manual/highdpi/pixelgadget/main.cpp
index 3f419adaf5..51174bc6d9 100644
--- a/tests/manual/highdpi/pixelgadget/main.cpp
+++ b/tests/manual/highdpi/pixelgadget/main.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2020 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGui>
#include <QtWidgets>
diff --git a/tests/manual/highdpi/screengadget/CMakeLists.txt b/tests/manual/highdpi/screengadget/CMakeLists.txt
index 030f8daa7c..f4a7aad306 100644
--- a/tests/manual/highdpi/screengadget/CMakeLists.txt
+++ b/tests/manual/highdpi/screengadget/CMakeLists.txt
@@ -1,21 +1,16 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+# Copyright (C) 2024 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)
+#####################################################################
+## screengadget Binary:
+#####################################################################
-find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
-
-qt_add_executable(screengadget
- main.cpp
-)
-
-target_link_libraries(screengadget PUBLIC
- Qt::Core
- Qt::Gui
- Qt::GuiPrivate
- Qt::Widgets
+qt_internal_add_manual_test(screengadget
+ GUI
+ SOURCES
+ main.cpp
+ LIBRARIES
+ Qt::Gui
+ Qt::Widgets
+ Qt::GuiPrivate
)
-
diff --git a/tests/manual/highdpi/screengadget/main.cpp b/tests/manual/highdpi/screengadget/main.cpp
index fdd940724f..68343a31c5 100644
--- a/tests/manual/highdpi/screengadget/main.cpp
+++ b/tests/manual/highdpi/screengadget/main.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGui>
#include <QtWidgets>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 14:01:19 +0000