diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-10 15:02:13 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-04-15 08:55:21 +0000 |
| commit | 280af371c3cb025378a1dec41a6d462164c4b497 (patch) | |
| tree | 73584c4faeb409ed1d7c4217d9e99bb59106d27c /tests/auto/qxmlquery | |
| parent | 2964bffaa5a8b9f5a11428548a1922b9389f0df1 (diff) | |
| download | qtxmlpatterns-280af371c3cb025378a1dec41a6d462164c4b497.tar.gz | |
Remove Windows CE.
Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses.
Task-number: QTBUG-51673
Change-Id: Id03f665883a501105e76c2842fb7c0fbf3086687
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/qxmlquery')
| -rw-r--r-- | tests/auto/qxmlquery/TestFundament.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qxmlquery/qxmlquery.pro | 10 | ||||
| -rw-r--r-- | tests/auto/qxmlquery/tst_qxmlquery.cpp | 14 |
3 files changed, 1 insertions, 25 deletions
diff --git a/tests/auto/qxmlquery/TestFundament.cpp b/tests/auto/qxmlquery/TestFundament.cpp index d28314f..9313fa1 100644 --- a/tests/auto/qxmlquery/TestFundament.cpp +++ b/tests/auto/qxmlquery/TestFundament.cpp @@ -43,7 +43,7 @@ TestFundament::TestFundament() QString TestFundament::offset() { -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) +#if defined(Q_OS_WIN) /* On Windows, the executable is placed in a release/ or debug/ folder. */ return QLatin1String("../"); #elif defined(Q_OS_MAC) diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro index 7dca9b9..1f25eda 100644 --- a/tests/auto/qxmlquery/qxmlquery.pro +++ b/tests/auto/qxmlquery/qxmlquery.pro @@ -14,13 +14,3 @@ QT += network testlib TESTDATA = data/* pushBaselines/* input.xml include (../xmlpatterns.pri) - -wince*: { - addFiles.files = pushBaselines input.xml - addFiles.path = . - - patternistFiles.files = ../xmlpatterns/queries - patternistFiles.path = ../xmlpatterns - - DEPLOYMENT += addFiles patternistFiles -} diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index c3d1e03..1754d7d 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -1984,13 +1984,6 @@ void tst_QXmlQuery::fnDocNetworkAccessSuccess() const || QTest::currentDataTag() == QByteArray("ftp scheme")) QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); -#if defined(Q_OS_WINCE) && !defined(_X86_) - QStringList testsToSkip; - testsToSkip << "http scheme" << "ftp scheme"; - if (testsToSkip.contains(QTest::currentDataTag())) - QSKIP("Network tests are currently unsupported on Windows CE."); -#endif - QFETCH(QUrl, uriToOpen); QFETCH(QByteArray, expectedOutput); @@ -2524,13 +2517,6 @@ void tst_QXmlQuery::setQueryQUrlSuccess() const || QTest::currentDataTag() == QByteArray("A valid query via the http scheme")) QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); -#if defined(Q_OS_WINCE) && !defined(_X86_) - QStringList testsToSkip; - testsToSkip << "A valid query via the ftp scheme" << "A valid query via the http scheme"; - if (testsToSkip.contains(QTest::currentDataTag())) - QSKIP("Network tests are currently unsupported on Windows CE."); -#endif - QFETCH(QUrl, queryURI); QFETCH(QByteArray, expectedOutput); |