From 4fed50f4ab8fa6331e2f4d1d0567dcc961e7bb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 18 Sep 2020 14:45:36 +0200 Subject: [PATCH] Prepare for having multiple highdpi manual tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the existing “kitchen sink” test out of the way, and rename it to “kitchensink” Change-Id: I121260e640bb2810a94f8112fcea212e97055fb3 Reviewed-by: Tor Arne Vestbø --- .../highdpi/{ => kitchensink}/CMakeLists.txt | 14 +++++++------- .../highdpi/{ => kitchensink}/dragwidget.cpp | 0 .../manual/highdpi/{ => kitchensink}/dragwidget.h | 0 .../{highdpi.pro => kitchensink/kitchensink.pro} | 4 ++-- .../{highdpi.qrc => kitchensink/kitchensink.qrc} | 0 tests/manual/highdpi/{ => kitchensink}/main.cpp | 2 +- .../manual/highdpi/{ => kitchensink}/qticon16.png | Bin .../highdpi/{ => kitchensink}/qticon16@2x.png | Bin .../highdpi/{ => kitchensink}/qticon16@3x.png | Bin .../manual/highdpi/{ => kitchensink}/qticon32.png | Bin .../highdpi/{ => kitchensink}/qticon32@2x.png | Bin .../manual/highdpi/{ => kitchensink}/qticon64.png | Bin 12 files changed, 10 insertions(+), 10 deletions(-) rename tests/manual/highdpi/{ => kitchensink}/CMakeLists.txt (67%) rename tests/manual/highdpi/{ => kitchensink}/dragwidget.cpp (100%) rename tests/manual/highdpi/{ => kitchensink}/dragwidget.h (100%) rename tests/manual/highdpi/{highdpi.pro => kitchensink/kitchensink.pro} (85%) rename tests/manual/highdpi/{highdpi.qrc => kitchensink/kitchensink.qrc} (100%) rename tests/manual/highdpi/{ => kitchensink}/main.cpp (99%) rename tests/manual/highdpi/{ => kitchensink}/qticon16.png (100%) rename tests/manual/highdpi/{ => kitchensink}/qticon16@2x.png (100%) rename tests/manual/highdpi/{ => kitchensink}/qticon16@3x.png (100%) rename tests/manual/highdpi/{ => kitchensink}/qticon32.png (100%) rename tests/manual/highdpi/{ => kitchensink}/qticon32@2x.png (100%) rename tests/manual/highdpi/{ => kitchensink}/qticon64.png (100%) diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/kitchensink/CMakeLists.txt similarity index 67% rename from tests/manual/highdpi/CMakeLists.txt rename to tests/manual/highdpi/kitchensink/CMakeLists.txt index b1635991858..b8dfa9be37a 100644 --- a/tests/manual/highdpi/CMakeLists.txt +++ b/tests/manual/highdpi/kitchensink/CMakeLists.txt @@ -1,10 +1,10 @@ -# Generated from highdpi.pro. +# Generated from kitchensink.pro. ##################################################################### -## highdpi Binary: +## kitchensink Binary: ##################################################################### -qt_internal_add_manual_test(highdpi +qt_internal_add_manual_test(kitchensink SOURCES dragwidget.cpp dragwidget.h main.cpp @@ -19,7 +19,7 @@ qt_internal_add_manual_test(highdpi ) # Resources: -set(highdpi_resource_files +set(kitchensink_resource_files "qticon16.png" "qticon16@2x.png" "qticon16@3x.png" @@ -28,13 +28,13 @@ set(highdpi_resource_files "qticon64.png" ) -qt_internal_add_resource(highdpi "highdpi" +qt_internal_add_resource(kitchensink "kitchensink" PREFIX "/" FILES - ${highdpi_resource_files} + ${kitchensink_resource_files} ) -#### Keys ignored in scope 1:.:.:highdpi.pro:: +#### Keys ignored in scope 1:.:.:kitchensink.pro:: # TEMPLATE = "app" diff --git a/tests/manual/highdpi/dragwidget.cpp b/tests/manual/highdpi/kitchensink/dragwidget.cpp similarity index 100% rename from tests/manual/highdpi/dragwidget.cpp rename to tests/manual/highdpi/kitchensink/dragwidget.cpp diff --git a/tests/manual/highdpi/dragwidget.h b/tests/manual/highdpi/kitchensink/dragwidget.h similarity index 100% rename from tests/manual/highdpi/dragwidget.h rename to tests/manual/highdpi/kitchensink/dragwidget.h diff --git a/tests/manual/highdpi/highdpi.pro b/tests/manual/highdpi/kitchensink/kitchensink.pro similarity index 85% rename from tests/manual/highdpi/highdpi.pro rename to tests/manual/highdpi/kitchensink/kitchensink.pro index 2de8ed3bb57..29a40b1ffc0 100644 --- a/tests/manual/highdpi/highdpi.pro +++ b/tests/manual/highdpi/kitchensink/kitchensink.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = highdpi +TARGET = kitchensink INCLUDEPATH += . QT += widgets gui-private CONFIG += cmdline @@ -13,6 +13,6 @@ HEADERS += \ dragwidget.h RESOURCES += \ - highdpi.qrc + kitchensink.qrc DEFINES += HAVE_SCREEN_BASE_DPI diff --git a/tests/manual/highdpi/highdpi.qrc b/tests/manual/highdpi/kitchensink/kitchensink.qrc similarity index 100% rename from tests/manual/highdpi/highdpi.qrc rename to tests/manual/highdpi/kitchensink/kitchensink.qrc diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/kitchensink/main.cpp similarity index 99% rename from tests/manual/highdpi/main.cpp rename to tests/manual/highdpi/kitchensink/main.cpp index 18c29bd9afd..bdb4c3d5715 100644 --- a/tests/manual/highdpi/main.cpp +++ b/tests/manual/highdpi/kitchensink/main.cpp @@ -949,7 +949,7 @@ public: { if (!moving) return; - QPoint pos = useCursorPos ? QCursor::pos() : e->globalPos(); + QPoint pos = useCursorPos ? QCursor::pos() : e->globalPosition().toPoint(); pos -= moveLabel->rect().center(); moveLabel->move(pos); mousePos = e->pos(); diff --git a/tests/manual/highdpi/qticon16.png b/tests/manual/highdpi/kitchensink/qticon16.png similarity index 100% rename from tests/manual/highdpi/qticon16.png rename to tests/manual/highdpi/kitchensink/qticon16.png diff --git a/tests/manual/highdpi/qticon16@2x.png b/tests/manual/highdpi/kitchensink/qticon16@2x.png similarity index 100% rename from tests/manual/highdpi/qticon16@2x.png rename to tests/manual/highdpi/kitchensink/qticon16@2x.png diff --git a/tests/manual/highdpi/qticon16@3x.png b/tests/manual/highdpi/kitchensink/qticon16@3x.png similarity index 100% rename from tests/manual/highdpi/qticon16@3x.png rename to tests/manual/highdpi/kitchensink/qticon16@3x.png diff --git a/tests/manual/highdpi/qticon32.png b/tests/manual/highdpi/kitchensink/qticon32.png similarity index 100% rename from tests/manual/highdpi/qticon32.png rename to tests/manual/highdpi/kitchensink/qticon32.png diff --git a/tests/manual/highdpi/qticon32@2x.png b/tests/manual/highdpi/kitchensink/qticon32@2x.png similarity index 100% rename from tests/manual/highdpi/qticon32@2x.png rename to tests/manual/highdpi/kitchensink/qticon32@2x.png diff --git a/tests/manual/highdpi/qticon64.png b/tests/manual/highdpi/kitchensink/qticon64.png similarity index 100% rename from tests/manual/highdpi/qticon64.png rename to tests/manual/highdpi/kitchensink/qticon64.png