Fix compiler warnings in Qt Network.

- Missing return value
- Wrong format for qint64

Change-Id: Id0de58c85b7c8ed2a62f7237fd23e6c5a5ac92ec
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>

diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 2c1ad95..a6eae79 100644 (file)
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -1964,7 +1964,7 @@ void QNetworkReplyHttpImplPrivate::setCachingEnabled(bool enable)
 
     if (enable) {
         if (bytesDownloaded) {
-            qDebug("setCachingEnabled: %d bytesDownloaded", bytesDownloaded);
+            qDebug("setCachingEnabled: %lld bytesDownloaded", bytesDownloaded);
             // refuse to enable in this case
             qCritical("QNetworkReplyImpl: backend error: caching was enabled after some bytes had been written");
             return;

diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index a2ed38b..e78b8bb 100644 (file)
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -475,8 +475,6 @@ QString QNetworkConfiguration::bearerTypeName() const
         return QString();
 
     switch (d->bearerType) {
-    case BearerUnknown:
-        return QStringLiteral("Unknown");
     case BearerEthernet:
         return QStringLiteral("Ethernet");
     case BearerWLAN:
@@ -493,7 +491,10 @@ QString QNetworkConfiguration::bearerTypeName() const
         return QStringLiteral("Bluetooth");
     case BearerWiMAX:
         return QStringLiteral("WiMAX");
+    case BearerUnknown:
+        break;
     }
+    return QStringLiteral("Unknown");
 }
 
 QT_END_NAMESPACE