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/text | |
| 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/text')
6 files changed, 8 insertions, 14 deletions
diff --git a/tests/auto/corelib/text/qlocale/CMakeLists.txt b/tests/auto/corelib/text/qlocale/CMakeLists.txt index 0f5a98ccce..363baa8d52 100644 --- a/tests/auto/corelib/text/qlocale/CMakeLists.txt +++ b/tests/auto/corelib/text/qlocale/CMakeLists.txt @@ -1,6 +1,4 @@ # Generated from qlocale.pro. add_subdirectory(test) -if(NOT WINRT) - add_subdirectory(syslocaleapp) -endif() +add_subdirectory(syslocaleapp) diff --git a/tests/auto/corelib/text/qlocale/qlocale.pro b/tests/auto/corelib/text/qlocale/qlocale.pro index 5161200260..abbe31d1ef 100644 --- a/tests/auto/corelib/text/qlocale/qlocale.pro +++ b/tests/auto/corelib/text/qlocale/qlocale.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -SUBDIRS += test -!winrt: SUBDIRS+=syslocaleapp +SUBDIRS += test \ + syslocaleapp diff --git a/tests/auto/corelib/text/qlocale/test/CMakeLists.txt b/tests/auto/corelib/text/qlocale/test/CMakeLists.txt index 19d454d530..399b22327e 100644 --- a/tests/auto/corelib/text/qlocale/test/CMakeLists.txt +++ b/tests/auto/corelib/text/qlocale/test/CMakeLists.txt @@ -25,5 +25,5 @@ qt_extend_target(tst_qlocale CONDITION NOT QT_FEATURE_doubleconversion AND NOT Q QT_NO_DOUBLECONVERSION ) -#### Keys ignored in scope 7:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 7:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../syslocaleapp/syslocaleapp" diff --git a/tests/auto/corelib/text/qlocale/test/test.pro b/tests/auto/corelib/text/qlocale/test/test.pro index f7243e99a7..7f38528f5f 100644 --- a/tests/auto/corelib/text/qlocale/test/test.pro +++ b/tests/auto/corelib/text/qlocale/test/test.pro @@ -16,4 +16,4 @@ win32 { } } -!android:!winrt: TEST_HELPER_INSTALLS = ../syslocaleapp/syslocaleapp +!android: TEST_HELPER_INSTALLS = ../syslocaleapp/syslocaleapp diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index b46f9aa567..4078805221 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -70,7 +70,7 @@ public: private slots: void initTestCase(); void cleanupTestCase(); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) void windowsDefaultLocale(); #endif #ifdef Q_OS_MAC @@ -2016,7 +2016,7 @@ void tst_QLocale::macDefaultLocale() } #endif // Q_OS_MAC -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) #include <qt_windows.h> static QString getWinLocaleInfo(LCTYPE type) @@ -2126,7 +2126,7 @@ void tst_QLocale::windowsDefaultLocale() QCOMPARE(locale.toString(QDateTime(QDate(1974, 12, 1), QTime(1,2,3)), QLocale::LongFormat), QStringLiteral("1@12@1974 ") + expectedFormattedLongTime); } -#endif // Q_OS_WIN but !Q_OS_WINRT +#endif // Q_OS_WIN void tst_QLocale::numberOptions() { diff --git a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp index 48f6628be1..ad973f73fc 100644 --- a/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp +++ b/tests/auto/corelib/text/qregularexpression/tst_qregularexpression.cpp @@ -2105,16 +2105,12 @@ void tst_QRegularExpression::threadSafety_data() QTest::addRow("pattern%d", ++i) << "ab.*cd" << subject; } - // pcre2 does not support JIT for winrt. As this test row takes a long time without JIT we skip - // it for winrt as it might time out in COIN. -#ifndef Q_OS_WINRT { QString subject = "ab"; subject.append(QString(512*1024, QLatin1Char('x'))); subject.append("c"); QTest::addRow("pattern%d", ++i) << "ab.*cd" << subject; } -#endif // Q_OS_WINRT { QString subject = "ab"; |