diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-02-24 13:07:24 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 13:55:49 +0100 |
| commit | d19d25a68bd92dc6a1b55de0a5c7e0fcce55299b (patch) | |
| tree | 7b217f8b5e667024c67430705b2e892ab459ee35 | |
| parent | 762a721f7f544f2428111f70f4d388f2d4134a55 (diff) | |
Use QSystemError for QDnsLookup windows backend
The OS provides the error string in this case.
This gives more information to the developer seeing a generic
error.
Change-Id: Ia03642982f3513ee5a8a9fa98d918e948f8d97a5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
| -rw-r--r-- | src/network/kernel/qdnslookup_win.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/network/kernel/qdnslookup_win.cpp b/src/network/kernel/qdnslookup_win.cpp index e7aaf29135..63f4377dfc 100644 --- a/src/network/kernel/qdnslookup_win.cpp +++ b/src/network/kernel/qdnslookup_win.cpp @@ -44,6 +44,7 @@ #include <qurl.h> #include <private/qmutexpool_p.h> +#include <private/qsystemerror_p.h> #include <qt_windows.h> #include <windns.h> @@ -76,7 +77,7 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN return; default: reply->error = QDnsLookup::InvalidReplyError; - reply->errorString = tr("Invalid reply received"); + reply->errorString = QSystemError(status, QSystemError::NativeError).toString(); return; } diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp index 3baca3c50b..249ccd3d75 100644 --- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp +++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp @@ -139,7 +139,7 @@ void tst_QDnsLookup::lookup() lookup.lookup(); QVERIFY(waitForDone(&lookup)); QVERIFY(lookup.isFinished()); - QCOMPARE(int(lookup.error()), error); + QVERIFY2(int(lookup.error()) == error, qPrintable(lookup.errorString())); if (error == QDnsLookup::NoError) QVERIFY(lookup.errorString().isEmpty()); QCOMPARE(int(lookup.type()), type); |