summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/kernel/qobject
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/kernel/qobject')
-rw-r--r--tests/auto/corelib/kernel/qobject/CMakeLists.txt14
-rw-r--r--tests/auto/corelib/kernel/qobject/qobject.pro4
-rw-r--r--tests/auto/corelib/kernel/qobject/tst_qobject.cpp3
3 files changed, 4 insertions, 17 deletions
diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
index 3be3287532..ba8c67bd99 100644
--- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
@@ -9,21 +9,11 @@ add_qt_test(tst_qobject
tst_qobject.cpp
DEFINES
QT_DISABLE_DEPRECATED_BEFORE=0
- LIBRARIES
- Qt::CorePrivate
PUBLIC_LIBRARIES
+ Qt::CorePrivate
Qt::Network
)
-#### Keys ignored in scope 3:.:.:test.pro:<TRUE>:
-# CONFIG = "testcase" "console"
-
## Scopes:
#####################################################################
-
-#### Keys ignored in scope 4:.:.:test.pro:QT_CONFIG___contains___c++1z:
-# CONFIG = "c++1z"
-
-if(NOT WINRT)
- add_subdirectory(signalbug)
-endif()
+add_subdirectory(signalbug)
diff --git a/tests/auto/corelib/kernel/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro
index 75ad7b5f14..bdbec1e9f8 100644
--- a/tests/auto/corelib/kernel/qobject/qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/qobject.pro
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS += test.pro
-!winrt: SUBDIRS += signalbug
+SUBDIRS += test.pro \
+ signalbug
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 917c4e639f..b2dc3c7297 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -1862,8 +1862,6 @@ void tst_QObject::moveToThread()
thread.wait();
}
- // WinRT does not allow connection to localhost
-#ifndef Q_OS_WINRT
{
// make sure socket notifiers are moved with the object
MoveToThreadThread thread;
@@ -1899,7 +1897,6 @@ void tst_QObject::moveToThread()
QMetaObject::invokeMethod(socket, "deleteLater", Qt::QueuedConnection);
thread.wait();
}
-#endif
}