summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2020-06-05 09:24:37 +0200
committerLiang Qi <liang.qi@qt.io>2020-06-06 20:25:49 +0200
commit45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch)
tree363dfd46575d147206267d854ce14747157f432e /tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
parentaa81b90738ce9faee5e433617c8bd243cb238729 (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/widgets/kernel/qapplication/tst_qapplication.cpp')
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index c9857b4379..b0689f5c16 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -241,9 +241,6 @@ public:
void tst_QApplication::alert()
{
-#ifdef Q_OS_WINRT
- QSKIP("WinRT does not support more than 1 native widget at the same time");
-#endif
int argc = 0;
QApplication app(argc, nullptr);
QApplication::alert(nullptr, 0);
@@ -811,9 +808,6 @@ public:
void tst_QApplication::closeAllWindows()
{
-#ifdef Q_OS_WINRT
- QSKIP("PromptOnCloseWidget does not work on WinRT - QTBUG-68297");
-#endif
int argc = 0;
QApplication app(argc, nullptr);
@@ -922,9 +916,6 @@ void tst_QApplication::libraryPaths()
expected = QSet<QString>(expected.constBegin(), expected.constEnd()).values();
expected.sort();
-#ifdef Q_OS_WINRT
- QEXPECT_FAIL("", "On WinRT PluginsPath is outside of sandbox. QTBUG-68297", Abort);
-#endif
QVERIFY2(isPathListIncluded(actual, expected),
qPrintable("actual:\n - " + actual.join("\n - ") +
"\nexpected:\n - " + expected.join("\n - ")));
@@ -1032,9 +1023,6 @@ void tst_QApplication::libraryPaths_qt_plugin_path_2()
<< QDir(QCoreApplication::applicationDirPath()).canonicalPath()
<< QDir(QDir::fromNativeSeparators(QString::fromLatin1(validPath))).canonicalPath();
-#ifdef Q_OS_WINRT
- QEXPECT_FAIL("", "On WinRT PluginsPath is outside of sandbox. QTBUG-68297", Abort);
-#endif
QVERIFY2(isPathListIncluded(QCoreApplication::libraryPaths(), expected),
qPrintable("actual:\n - " + QCoreApplication::libraryPaths().join("\n - ") +
"\nexpected:\n - " + expected.join("\n - ")));
@@ -1753,9 +1741,6 @@ void tst_QApplication::focusMouseClick()
QSpontaneKeyEvent::setSpontaneous(&ev);
QVERIFY(ev.spontaneous());
qApp->notify(&w2, &ev);
-#ifdef Q_OS_WINRT
- QEXPECT_FAIL("", "Fails on WinRT - QTBUG-68297", Abort);
-#endif
QTRY_COMPARE(QApplication::focusWidget(), &w2);
// now back to tab focus and click again (it already had focus) -> focus should stay