Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/corelib/kernel/qobject.h
	src/declarative/graphicsitems/qdeclarativeflickable.cpp
	src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
	src/declarative/util/qdeclarativelistmodel.cpp

8 files changed, 37 insertions, 27 deletions

diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro
index bbe8ab1..d1d75f0 100644
--- a/src/plugins/bearer/bearer.pro
+++ b/src/plugins/bearer/bearer.pro
@@ -3,9 +3,9 @@ TEMPLATE = subdirs
 contains(QT_CONFIG, dbus) {
     contains(QT_CONFIG, icd) {
         SUBDIRS += icd
-    } else {
+    } else:linux* {
         SUBDIRS += generic
-        linux*:SUBDIRS += connman networkmanager
+        SUBDIRS += connman networkmanager
     }
 }
 
@@ -16,4 +16,4 @@ macx:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan
 macx:SUBDIRS += generic
 symbian:SUBDIRS += symbian
 
-isEmpty(SUBDIRS):SUBDIRS += generic
+isEmpty(SUBDIRS):SUBDIRS = generic
diff --git a/src/plugins/bearer/connman/qofonoservice_linux_p.h b/src/plugins/bearer/connman/qofonoservice_linux_p.h
index 4892666..0ac1e4a 100644
--- a/src/plugins/bearer/connman/qofonoservice_linux_p.h
+++ b/src/plugins/bearer/connman/qofonoservice_linux_p.h
@@ -329,4 +329,6 @@ Q_SIGNALS:
     void incomingMessage(const QString &message, const QVariantMap &info);
 };
 
+QT_END_NAMESPACE
+
 #endif //QOFONOSERVICE_H
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 29445ce..554f9b7 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -97,6 +97,10 @@ QNetworkManagerEngine::QNetworkManagerEngine(QObject *parent)
 
 QNetworkManagerEngine::~QNetworkManagerEngine()
 {
+    qDeleteAll(connections);
+    qDeleteAll(accessPoints);
+    qDeleteAll(wirelessDevices);
+    qDeleteAll(activeConnections);
 }
 
 void QNetworkManagerEngine::initialize()
@@ -389,7 +393,7 @@ void QNetworkManagerEngine::deviceRemoved(const QDBusObjectPath &path)
 {
     QMutexLocker locker(&mutex);
 
-    delete wirelessDevices.value(path.path());
+    delete wirelessDevices.take(path.path());
 }
 
 void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path,
@@ -455,6 +459,8 @@ void QNetworkManagerEngine::removeConnection(const QString &path)
 
     QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.take(id);
 
+    connection->deleteLater();
+
     locker.unlock();
     emit configurationRemoved(ptr);
 }
@@ -631,7 +637,8 @@ void QNetworkManagerEngine::removeAccessPoint(const QString &path,
 
                         locker.unlock();
                         emit configurationChanged(ptr);
-                        return;
+                        locker.relock();
+                        break;
                     }
                 }
             } else {
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
index f47c97c..499fe5a 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
@@ -743,8 +743,6 @@ bool QNetworkManagerSettingsConnection::isAutoConnect()
 
 quint64 QNetworkManagerSettingsConnection::getTimestamp()
 {
-    qDebug() << d->settingsMap.value(QLatin1String("connection"));
-
     return d->settingsMap.value(QLatin1String("connection"))
                          .value(QLatin1String("timestamp")).toUInt();
 }
diff --git a/src/plugins/bearer/symbian/3_2/3_2.pro b/src/plugins/bearer/symbian/3_2/3_2.pro
index 6f3ecaf..ac3b3f8 100644
--- a/src/plugins/bearer/symbian/3_2/3_2.pro
+++ b/src/plugins/bearer/symbian/3_2/3_2.pro
@@ -1,13 +1,15 @@
 include(../symbian.pri)
 
 symbian {
-    exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
-    exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
+    contains(S60_VERSION, 3.1) {
+        is_using_gnupoc {
+            LIBS += -lapengine
+        } else {
+            LIBS += -lAPEngine
+        }
+    } else {
         DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
         LIBS += -lcmmanager
-    } else {
-        # Fall back to 3_1 implementation on platforms that do not have cmmanager
-        LIBS += -lapengine
     }
 }
 
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri
index 9b3f50c..e874945 100644
--- a/src/plugins/bearer/symbian/symbian.pri
+++ b/src/plugins/bearer/symbian/symbian.pri
@@ -22,11 +22,9 @@ LIBS += -lcommdb \
         -lnetmeta
 
 is_using_gnupoc {
-    LIBS += -lconnmon \
-            -lapsettingshandlerui
+    LIBS += -lconnmon
 } else {
-    LIBS += -lConnMon \
-            -lApSettingsHandlerUI
+    LIBS += -lConnMon
 }
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer
diff --git a/src/plugins/bearer/symbian/symbian.pro b/src/plugins/bearer/symbian/symbian.pro
index f320eb6..91f8217 100644
--- a/src/plugins/bearer/symbian/symbian.pro
+++ b/src/plugins/bearer/symbian/symbian.pro
@@ -1,3 +1,8 @@
 TEMPLATE = subdirs
 
-SUBDIRS += 3_1 3_2 symbian_3
\ No newline at end of file
+contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+    SUBDIRS += 3_1 3_2
+}
+
+# Symbian3 builds the default plugin for winscw so it is always needed
+SUBDIRS += symbian_3
\ No newline at end of file
diff --git a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
index fd66198..ef90ad2 100644
--- a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
+++ b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
@@ -1,22 +1,20 @@
 include(../symbian.pri)
 
 symbian {
-    exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
-    exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
+    contains(S60_VERSION, 3.1) {
+        is_using_gnupoc {
+            LIBS += -lapengine
+        } else {
+            LIBS += -lAPEngine
+        }
+    } else {
         DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
         LIBS += -lcmmanager
 
-        exists($$prependEpocroot($$MW_LAYER_PUBLIC_EXPORT_PATH(extendedconnpref.h))) {
+        !contains(S60_VERSION, 3.2):!contains(S60_VERSION, 5.0) {
             DEFINES += OCC_FUNCTIONALITY_AVAILABLE
             LIBS += -lextendedconnpref
         }
-    } else {
-        # Fall back to 3_1 implementation on platforms that do not have cmmanager
-        is_using_gnupoc {
-            LIBS += -lapengine
-        } else {
-            LIBS += -lAPEngine
-        }
     }
 }