diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:25:17 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:25:57 +0200 |
| commit | 6d3df9df2930a15877d81abec9ac10052968d9c4 (patch) | |
| tree | 31a05f11c2064436a681e0d5813d311f9082b00c /tests/auto | |
| parent | 85c2acf0bc83509cc56464630caf27baf96282ca (diff) | |
| parent | d6b4d9ad75b06b16d7555ebeace6f06010379cf5 (diff) | |
| download | qtxmlpatterns-6d3df9df2930a15877d81abec9ac10052968d9c4.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I8472ccedaa829436aebf4424b64a3b7dd0adc173
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 7e0eb32..86020dd 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -131,8 +131,6 @@ void tst_XmlPatterns::xquerySupport() #ifdef Q_OS_WINCE QSKIP("WinCE: This test uses unsupported WinCE functionality"); -#elif defined(Q_OS_MAC) - QSKIP("MacOs: Failed on Mac. Will be fixed by bug fix for QTBUG-22556"); #endif QFETCH(int, expectedExitCode); |