diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
| commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
| tree | 363dfd46575d147206267d854ce14747157f432e /tests/manual | |
| parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) | |
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.
Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/diaglib/diaglib.pri | 2 | ||||
| -rw-r--r-- | tests/manual/embeddedintoforeignwindow/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/manual/foreignwindows/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/manual/diaglib/diaglib.pri b/tests/manual/diaglib/diaglib.pri index dd5bfa5330..617e4e72a9 100644 --- a/tests/manual/diaglib/diaglib.pri +++ b/tests/manual/diaglib/diaglib.pri @@ -10,7 +10,7 @@ HEADERS += \ $$PWD/qwindowdump.h \ $$PWD/nativewindowdump.h -win32:!winrt: { +win32: { SOURCES += $$PWD/nativewindowdump_win.cpp QMAKE_USE += user32 } else { diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt index c07c8dec5d..2de0ff3bfb 100644 --- a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt +++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt @@ -28,14 +28,14 @@ add_qt_manual_test(embeddedintoforeignwindow ## Scopes: ##################################################################### -extend_target(embeddedintoforeignwindow CONDITION WIN32 AND NOT WINRT +extend_target(embeddedintoforeignwindow CONDITION WIN32 SOURCES ../diaglib/nativewindowdump_win.cpp PUBLIC_LIBRARIES user32 ) -extend_target(embeddedintoforeignwindow CONDITION UNIX OR WINRT +extend_target(embeddedintoforeignwindow CONDITION UNIX SOURCES ../diaglib/nativewindowdump.cpp ) diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt index 8fa02ca607..d22636925a 100644 --- a/tests/manual/foreignwindows/CMakeLists.txt +++ b/tests/manual/foreignwindows/CMakeLists.txt @@ -29,14 +29,14 @@ add_qt_manual_test(foreignwindows ## Scopes: ##################################################################### -extend_target(foreignwindows CONDITION WIN32 AND NOT WINRT +extend_target(foreignwindows CONDITION WIN32 SOURCES ../diaglib/nativewindowdump_win.cpp PUBLIC_LIBRARIES user32 ) -extend_target(foreignwindows CONDITION UNIX OR WINRT +extend_target(foreignwindows CONDITION UNIX SOURCES ../diaglib/nativewindowdump.cpp ) |