Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	configure
	mkspecs/common/wince/qplatformdefs.h
	src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp

Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c

11 files changed, 40 insertions, 40 deletions

diff --git a/src/plugins/bearer/android/src/src.pro b/src/plugins/bearer/android/src/src.pro
index 1050601896..eb0738386c 100644
--- a/src/plugins/bearer/android/src/src.pro
+++ b/src/plugins/bearer/android/src/src.pro
@@ -1,11 +1,5 @@
-include(wrappers/wrappers.pri)
-
 TARGET = qandroidbearer
 
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QAndroidBearerEnginePlugin
-load(qt_plugin)
-
 QT = core-private network-private
 
 HEADERS += qandroidbearerengine.h \
@@ -15,3 +9,9 @@ HEADERS += qandroidbearerengine.h \
 SOURCES += main.cpp \
            qandroidbearerengine.cpp \
            ../../qnetworksession_impl.cpp
+
+include(wrappers/wrappers.pri)
+
+PLUGIN_TYPE = bearer
+PLUGIN_CLASS_NAME = QAndroidBearerEnginePlugin
+load(qt_plugin)
diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro
index efa13a6ebd..9f3fff304b 100644
--- a/src/plugins/bearer/connman/connman.pro
+++ b/src/plugins/bearer/connman/connman.pro
@@ -1,9 +1,5 @@
 TARGET = qconnmanbearer
 
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QConnmanEnginePlugin
-load(qt_plugin)
-
 QT = core network-private dbus
 CONFIG += link_pkgconfig
 
@@ -21,3 +17,6 @@ SOURCES += main.cpp \
 
 OTHER_FILES += connman.json
 
+PLUGIN_TYPE = bearer
+PLUGIN_CLASS_NAME = QConnmanEnginePlugin
+load(qt_plugin)
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 901af8dece..135aad4dec 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -162,7 +162,7 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal)
                                QLatin1String(CONNMAN_MANAGER_INTERFACE),
                                QLatin1String("PropertyChanged"),
                                    this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
-            qWarning() << "PropertyChanged not connected";
+            qWarning("PropertyChanged not connected");
         }
     }
 
@@ -173,7 +173,7 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal)
                                QLatin1String(CONNMAN_MANAGER_INTERFACE),
                                QLatin1String("ServicesChanged"),
                                this,SLOT(onServicesChanged(ConnmanMapList, QList<QDBusObjectPath>)))) {
-            qWarning() << "servicesChanged not connected";
+            qWarning("servicesChanged not connected");
         }
     }
 }
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro
index 674af0cbbe..ab0257aecd 100644
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@@ -1,9 +1,5 @@
 TARGET = qcorewlanbearer
 
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QCoreWlanEnginePlugin
-load(qt_plugin)
-
 QT = core-private network-private
 LIBS += -framework Foundation -framework SystemConfiguration
 
@@ -21,3 +17,7 @@ SOURCES += main.cpp \
 OBJECTIVE_SOURCES += qcorewlanengine.mm
 
 OTHER_FILES += corewlan.json
+
+PLUGIN_TYPE = bearer
+PLUGIN_CLASS_NAME = QCoreWlanEnginePlugin
+load(qt_plugin)
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index aab8a5e05b..3f8f80fc85 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -164,6 +164,7 @@ void QScanThread::run()
     mutex.lock();
     CWInterface *currentInterface = [CWInterface interfaceWithName: QCFString::toNSString(interfaceName)];
     mutex.unlock();
+    const bool currentInterfaceServiceActive = currentInterface.serviceActive;
 
     if (currentInterface.powerOn) {
         NSError *err = nil;
@@ -178,7 +179,7 @@ void QScanThread::run()
 
                 QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Undefined;
                 bool known = isKnownSsid(networkSsid);
-                if (currentInterface.serviceActive) {
+                if (currentInterfaceServiceActive) {
                     if( networkSsid == QCFString::toQString( [currentInterface ssid])) {
                         state = QNetworkConfiguration::Active;
                     }
@@ -221,7 +222,7 @@ void QScanThread::run()
                 interfaceName = ij.value();
             }
 
-            if (currentInterface.serviceActive) {
+            if (currentInterfaceServiceActive) {
                 if( networkSsid == QCFString::toQString([currentInterface ssid])) {
                     state = QNetworkConfiguration::Active;
                 }
diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro
index d0e17380e3..f71a901341 100644
--- a/src/plugins/bearer/generic/generic.pro
+++ b/src/plugins/bearer/generic/generic.pro
@@ -1,9 +1,5 @@
 TARGET = qgenericbearer
 
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QGenericEnginePlugin
-load(qt_plugin)
-
 QT = core-private network-private
 
 HEADERS += qgenericengine.h \
@@ -15,3 +11,7 @@ SOURCES += qgenericengine.cpp \
            main.cpp
 
 OTHER_FILES += generic.json
+
+PLUGIN_TYPE = bearer
+PLUGIN_CLASS_NAME = QGenericEnginePlugin
+load(qt_plugin)
diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro
index e372c8ca05..da7f2da353 100644
--- a/src/plugins/bearer/nativewifi/nativewifi.pro
+++ b/src/plugins/bearer/nativewifi/nativewifi.pro
@@ -1,9 +1,5 @@
 TARGET = qnativewifibearer
 
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QNativeWifiEnginePlugin
-load(qt_plugin)
-
 QT = core-private network-private
 
 HEADERS += qnativewifiengine.h \
@@ -16,3 +12,7 @@ SOURCES += main.cpp \
            ../qnetworksession_impl.cpp
 
 OTHER_FILES += nativewifi.json
+
+PLUGIN_TYPE = bearer
+PLUGIN_CLASS_NAME = QNativeWifiEnginePlugin
+load(qt_plugin)
diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro
index b3a270615c..e71c93f66f 100644
--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@@ -1,9 +1,5 @@
 TARGET = qnmbearer
 
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QNetworkManagerEnginePlugin
-load(qt_plugin)
-
 QT = core network-private dbus
 
 HEADERS += qnetworkmanagerservice.h \
@@ -19,3 +15,7 @@ SOURCES += main.cpp \
            ../qnetworksession_impl.cpp
 
 OTHER_FILES += networkmanager.json
+
+PLUGIN_TYPE = bearer
+PLUGIN_CLASS_NAME = QNetworkManagerEnginePlugin
+load(qt_plugin)
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
index 8eebf86d67..6c3c661db6 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
@@ -136,7 +136,7 @@ bool QNetworkManagerInterface::setConnections()
 QList <QDBusObjectPath> QNetworkManagerInterface::getDevices()
 {
     if (devicesPathList.isEmpty()) {
-        //qWarning() << "using blocking call!";
+        //qWarning("using blocking call!");
         QDBusReply<QList<QDBusObjectPath> > reply = call(QLatin1String("GetDevices"));
         devicesPathList = reply.value();
     }
@@ -639,7 +639,7 @@ void QNetworkManagerInterfaceDeviceWireless::accessPointsFinished(QDBusPendingCa
 QList <QDBusObjectPath> QNetworkManagerInterfaceDeviceWireless::getAccessPoints()
 {
     if (accessPointsList.isEmpty()) {
-        //qWarning() << "Using blocking call!";
+        //qWarning("Using blocking call!");
         QDBusReply<QList<QDBusObjectPath> > reply
                 = call(QLatin1String("GetAccessPoints"));
         accessPointsList = reply.value();
@@ -802,7 +802,7 @@ bool QNetworkManagerSettings::setConnections()
 QList <QDBusObjectPath> QNetworkManagerSettings::listConnections()
 {
     if (connectionsList.isEmpty()) {
-        //qWarning() << "Using blocking call!";
+        //qWarning("Using blocking call!");
         QDBusReply<QList<QDBusObjectPath> > reply
                 = call(QLatin1String("ListConnections"));
         connectionsList = reply.value();
@@ -874,7 +874,7 @@ void QNetworkManagerSettingsConnection::slotSettingsRemoved()
 QNmSettingsMap QNetworkManagerSettingsConnection::getSettings()
 {
     if (settingsMap.isEmpty()) {
-        //qWarning() << "Using blocking call!";
+        //qWarning("Using blocking call!");
         QDBusReply<QNmSettingsMap> reply = call(QLatin1String("GetSettings"));
         settingsMap = reply.value();
     }
diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index bac7608477..32ff5446e5 100644
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -1,9 +1,5 @@
 TARGET = qnlabearer
 
-PLUGIN_TYPE = bearer
-PLUGIN_CLASS_NAME = QNlaEnginePlugin
-load(qt_plugin)
-
 QT = core core-private network network-private
 
 !wince* {
@@ -22,3 +18,7 @@ SOURCES += main.cpp \
            ../qnetworksession_impl.cpp
 
 OTHER_FILES += nla.json
+
+PLUGIN_TYPE = bearer
+PLUGIN_CLASS_NAME = QNlaEnginePlugin
+load(qt_plugin)
diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp
index 0b765a8485..726e1efb92 100644
--- a/src/plugins/bearer/nla/qnlaengine.cpp
+++ b/src/plugins/bearer/nla/qnlaengine.cpp
@@ -110,10 +110,10 @@ static void printBlob(NLA_BLOB *blob)
                  << "\tshared adapter name:" << blob->data.ICS.remote.sharedAdapterName;
         break;
     default:
-        qDebug() << "UNKNOWN BLOB TYPE";
+        qDebug("UNKNOWN BLOB TYPE");
     }
 
-    qDebug() << "===== END NLA_BLOB =====";
+    qDebug("===== END NLA_BLOB =====");
 }
 #endif