diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-21 10:07:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-21 10:07:35 +0200 |
| commit | d26940d7769a35a517195079d7b402b0b6eb3c92 (patch) | |
| tree | 3529e42d7bc3de903382a2dfc566b74675f188f0 /tests/auto/xmlpatterns/tst_xmlpatterns.cpp | |
| parent | 43c28d4084a2c3e63cf02f45c03c9514ee8af2a4 (diff) | |
| parent | 54e7255eb18b1247d7cfda2d6bc120dc9c0f119b (diff) | |
| download | qtxmlpatterns-d26940d7769a35a517195079d7b402b0b6eb3c92.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: If5ed6ad45422c7cf8a250e31a10ce2930e5c1cf7
Diffstat (limited to 'tests/auto/xmlpatterns/tst_xmlpatterns.cpp')
| -rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 8db61b9..e2f7337 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -33,6 +33,10 @@ #include "../qxmlquery/TestFundament.h" #include "../network-settings.h" +#ifdef Q_OS_WIN +# include <qt_windows.h> +#endif + /*! \class tst_XmlPatterns \internal @@ -1043,6 +1047,12 @@ QString tst_XmlPatterns::filterStderr(const QString &in) for (const QRegExp& rx : irrelevant) out = out.remove(rx); +#ifdef Q_OS_WIN + // replace some Win32 error messages by standard Unix ones + out.replace(qt_error_string(ERROR_FILE_NOT_FOUND), "No such file or directory"); + out.replace(qt_error_string(ERROR_PATH_NOT_FOUND), "No such file or directory"); +#endif + return out; } |