summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/global/qlogging
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/global/qlogging')
-rw-r--r--tests/auto/corelib/global/qlogging/CMakeLists.txt26
-rw-r--r--tests/auto/corelib/global/qlogging/qlogging.pro6
-rw-r--r--tests/auto/corelib/global/qlogging/test/test.pro6
3 files changed, 17 insertions, 21 deletions
diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt
index 7c74656215..ce9235f91e 100644
--- a/tests/auto/corelib/global/qlogging/CMakeLists.txt
+++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt
@@ -1,19 +1,17 @@
-if(NOT WINRT)
- add_qt_executable(qlogging_helper
- NO_INSTALL # special case
- OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
- SOURCES app/main.cpp
- DEFINES QT_MESSAGELOGCONTEXT
- LIBRARIES Qt::Core)
+add_qt_executable(qlogging_helper
+ NO_INSTALL # special case
+ OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+ SOURCES app/main.cpp
+ DEFINES QT_MESSAGELOGCONTEXT
+ LIBRARIES Qt::Core)
- #special case begin
- # Fixes required for the backtrace stack to be correct
- if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
- target_link_options(qlogging_helper PRIVATE -rdynamic)
- endif()
- set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
- # special case end
+#special case begin
+# Fixes required for the backtrace stack to be correct
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
+ target_link_options(qlogging_helper PRIVATE -rdynamic)
endif()
+set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
+# special case end
add_qt_test(tst_qlogging SOURCES tst_qlogging.cpp
DEFINES
diff --git a/tests/auto/corelib/global/qlogging/qlogging.pro b/tests/auto/corelib/global/qlogging/qlogging.pro
index bbe75297d5..c81e257a2d 100644
--- a/tests/auto/corelib/global/qlogging/qlogging.pro
+++ b/tests/auto/corelib/global/qlogging/qlogging.pro
@@ -1,8 +1,6 @@
TEMPLATE = subdirs
-!winrt {
- test.depends = app
- SUBDIRS += app
-}
+test.depends = app
+SUBDIRS += app
SUBDIRS += test
diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro
index 81445247e0..c6c5950ff1 100644
--- a/tests/auto/corelib/global/qlogging/test/test.pro
+++ b/tests/auto/corelib/global/qlogging/test/test.pro
@@ -4,14 +4,14 @@ qtConfig(c++14): CONFIG += c++14
debug_and_release {
CONFIG(debug, debug|release) {
TARGET = ../../debug/tst_qlogging
- !android:!winrt: TEST_HELPER_INSTALLS = ../debug/helper
+ !android: TEST_HELPER_INSTALLS = ../debug/helper
} else {
TARGET = ../../release/tst_qlogging
- !android:!winrt: TEST_HELPER_INSTALLS = ../release/helper
+ !android: TEST_HELPER_INSTALLS = ../release/helper
}
} else {
TARGET = ../tst_qlogging
- !android:!winrt: TEST_HELPER_INSTALLS = ../helper
+ !android: TEST_HELPER_INSTALLS = ../helper
}
QT = core testlib