From d19d25a68bd92dc6a1b55de0a5c7e0fcce55299b Mon Sep 17 00:00:00 2001
From: Shane Kearns <ext-shane.2.kearns@nokia.com>
Date: Fri, 24 Feb 2012 13:07:24 +0000
Subject: [PATCH] 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>
---
 src/network/kernel/qdnslookup_win.cpp                   | 3 ++-
 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 e7aaf29..63f4377 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 3baca3c..249ccd3 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);
-- 
2.7.4