diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-09 14:59:40 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-10 11:52:30 +0100 |
| commit | 2304acab5ff3bd3832c2e388cfdab27f2a95caa8 (patch) | |
| tree | 836fda9d762ec9c4f8461804f1e2d22cdf16303f /tests/auto/gui/kernel | |
| parent | b94b7687b0635ee74a3ccd83a234ead0600fd47f (diff) | |
CMake: Regenerate projects using pro2cmake one last time
And fix up some wrong qmake project files
Pick-to: 6.0
Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/gui/kernel')
| -rw-r--r-- | tests/auto/gui/kernel/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/kernel.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt | 14 |
4 files changed, 2 insertions, 22 deletions
diff --git a/tests/auto/gui/kernel/.prev_CMakeLists.txt b/tests/auto/gui/kernel/.prev_CMakeLists.txt index 33c8b35391..85dc42305f 100644 --- a/tests/auto/gui/kernel/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/.prev_CMakeLists.txt @@ -11,6 +11,7 @@ add_subdirectory(qevent) add_subdirectory(qfileopenevent) add_subdirectory(qguieventdispatcher) add_subdirectory(qguitimer) +add_subdirectory(qhighdpi) add_subdirectory(qinputdevice) add_subdirectory(qinputmethod) add_subdirectory(qkeyevent) @@ -35,9 +36,6 @@ if(QT_FEATURE_shortcut) add_subdirectory(qkeysequence) add_subdirectory(qshortcut) endif() -if(QT_FEATURE_highdpiscaling) - add_subdirectory(qhighdpiscaling) -endif() if(TARGET Qt::Widgets) add_subdirectory(qmouseevent_modal) add_subdirectory(qtouchevent) diff --git a/tests/auto/gui/kernel/CMakeLists.txt b/tests/auto/gui/kernel/CMakeLists.txt index a22c0262c5..e19ee9a75c 100644 --- a/tests/auto/gui/kernel/CMakeLists.txt +++ b/tests/auto/gui/kernel/CMakeLists.txt @@ -11,6 +11,7 @@ add_subdirectory(qevent) add_subdirectory(qfileopenevent) add_subdirectory(qguieventdispatcher) add_subdirectory(qguitimer) +add_subdirectory(qhighdpi) add_subdirectory(qinputdevice) add_subdirectory(qinputmethod) add_subdirectory(qkeyevent) @@ -35,9 +36,6 @@ if(QT_FEATURE_shortcut) add_subdirectory(qkeysequence) add_subdirectory(qshortcut) endif() -if(QT_FEATURE_highdpiscaling) - add_subdirectory(qhighdpi) -endif() if(TARGET Qt::Widgets) add_subdirectory(qmouseevent_modal) add_subdirectory(qtouchevent) diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro index 82b7baba54..88108453b8 100644 --- a/tests/auto/gui/kernel/kernel.pro +++ b/tests/auto/gui/kernel/kernel.pro @@ -51,8 +51,6 @@ win32:qtHaveModule(network): SUBDIRS += noqteventloop qaction \ qactiongroup -!qtConfig(highdpiscaling): SUBDIRS -= qhighdpiscaling - !qtConfig(opengl): SUBDIRS -= qopenglwindow android|uikit: SUBDIRS -= qclipboard diff --git a/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt b/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt deleted file mode 100644 index 9db351dbda..0000000000 --- a/tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Generated from qhighdpiscaling.pro. - -##################################################################### -## tst_qhighdpiscaling Test: -##################################################################### - -qt_internal_add_test(tst_qhighdpiscaling - SOURCES - tst_qhighdpiscaling.cpp - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate -) |