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/auto/corelib/kernel/qsharedmemory | |
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/auto/corelib/kernel/qsharedmemory')
3 files changed, 29 insertions, 12 deletions
diff --git a/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt new file mode 100644 index 0000000000..7cd08cd377 --- /dev/null +++ b/tests/auto/corelib/kernel/qsharedmemory/.prev_CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from qsharedmemory.pro. + + ##################################################################### + ## tst_qsharedmemory Test: + ##################################################################### + + add_qt_test(tst_qsharedmemory + SOURCES + tst_qsharedmemory.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + ) + + ## Scopes: + ##################################################################### + + extend_target(tst_qsharedmemory CONDITION LINUX + PUBLIC_LIBRARIES + rt + ) +if(QT_FEATURE_sharedmemory) + add_subdirectory(producerconsumer) +endif() diff --git a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt index 366e76d034..c96e6a8825 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt @@ -1,7 +1,6 @@ # Generated from qsharedmemory.pro. - -if(QT_FEATURE_sharedmemory) +if(QT_FEATURE_sharedmemory) # special case ##################################################################### ## tst_qsharedmemory Test: ##################################################################### @@ -9,13 +8,10 @@ if(QT_FEATURE_sharedmemory) add_qt_test(tst_qsharedmemory SOURCES tst_qsharedmemory.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) -#### Keys ignored in scope 4:.:.:test.pro:<TRUE>: - # CONFIG = "testcase" - ## Scopes: ##################################################################### @@ -23,8 +19,6 @@ if(QT_FEATURE_sharedmemory) PUBLIC_LIBRARIES rt ) - - if(NOT WINRT) - add_subdirectory(producerconsumer) - endif() +# if(QT_FEATURE_sharedmemory) # special case + add_subdirectory(producerconsumer) endif() diff --git a/tests/auto/corelib/kernel/qsharedmemory/qsharedmemory.pro b/tests/auto/corelib/kernel/qsharedmemory/qsharedmemory.pro index 323d5bbd37..91ac28fe0d 100644 --- a/tests/auto/corelib/kernel/qsharedmemory/qsharedmemory.pro +++ b/tests/auto/corelib/kernel/qsharedmemory/qsharedmemory.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs qtConfig(sharedmemory) { - !winrt: SUBDIRS = producerconsumer - SUBDIRS += test.pro + SUBDIRS = producerconsumer \ + test.pro } |