From e75980a322ea1088e1c6bf60259b8ba853d32444 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 15 Dec 2010 15:30:43 +1000
Subject: Fix possible null pointer dereference.

When parsing a new connection an access point with the same SSID may not
have been previously seen.

Task-number: QTBUG-15276
---
 src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 554f9b7..f93b605 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -743,9 +743,11 @@ QNetworkConfigurationPrivate *QNetworkManagerEngine::parseConnection(const QStri
                     QNetworkConfigurationPrivatePointer ptr =
                         accessPointConfigurations.take(accessPointId);
 
-                    mutex.unlock();
-                    emit configurationRemoved(ptr);
-                    mutex.lock();
+                    if (ptr) {
+                        mutex.unlock();
+                        emit configurationRemoved(ptr);
+                        mutex.lock();
+                    }
                 }
                 break;
             }
-- 
cgit v0.12


From 27de60f2f6047cb3f698825af96e569fde04ef06 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 15 Dec 2010 17:06:25 +1000
Subject: Add extra type of embedded license.

Marketing needs this for commercial customers.

Reviewed-by: Trust Me
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 7141880..aa8d047 100755
--- a/configure
+++ b/configure
@@ -480,7 +480,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
             # Qt All-OS
             LICENSE_EXTENSION="-ALLOS"
             ;;
-        8M,* | KM,* | S9,* | SC,* | SU,* | SW,* | X9,* | XC,* | XU,* | XW,*)
+        8M,* | KM,* | S9,* | SC,* | SM,* | SU,* | SW,* | X9,* | XC,* | XU,* | XW,*)
             # Qt for Embedded Linux
             LICENSE_EXTENSION="-EMBEDDED"
             ;;
-- 
cgit v0.12