Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fixed license headers for examples in 4.7
  Removing extra comma in `enum' declaration.
  win32-g++: Correct the order of linked Windows libraries
  Remove SIGBUS emission from QNetworkSession destruction.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h
index 6938892..7f487a0 100644
--- a/src/declarative/qml/qdeclarativetypeloader_p.h
+++ b/src/declarative/qml/qdeclarativetypeloader_p.h
@@ -79,7 +79,7 @@ public:
         Loading,                 // Prior to data being received and dataReceived() being called
         WaitingForDependencies,  // While there are outstanding addDependency()s
         Complete,                // Finished
-        Error,                   // Error
+        Error                    // Error
     };
 
     enum Type {
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 9503553..2613bf8 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -260,7 +260,7 @@ QNetworkSession::QNetworkSession(const QNetworkConfiguration& connectionConfig,
 */
 QNetworkSession::~QNetworkSession()
 {
-    delete d;
+    d->deleteLater();
 }
 
 /*!