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:
  qdoc: Fixed spacing before "default" and "read-only".
  Designer: Fix compiler warnings.
  Fix compiler warning.
  Abort if connection to DBus cannot be established.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 9a17d78..4abffc6 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -347,6 +347,7 @@ void QDeclarativeContents::complete()
 
 void QDeclarativeContents::itemGeometryChanged(QDeclarativeItem *changed, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
+    Q_UNUSED(changed)
     //### we can only pass changed if the left edge has moved left, or the right edge has moved right
     if (newGeometry.width() != oldGeometry.width() || newGeometry.x() != oldGeometry.x())
         calcWidth(/*changed*/);
diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp
index 9d1bfab..3033140 100644
--- a/src/plugins/bearer/icd/qicdengine.cpp
+++ b/src/plugins/bearer/icd/qicdengine.cpp
@@ -52,7 +52,7 @@
 QT_BEGIN_NAMESPACE
 
 IcdNetworkConfigurationPrivate::IcdNetworkConfigurationPrivate()
-:   network_attrs(0), service_attrs(0)
+:   service_attrs(0), network_attrs(0)
 {
 }
 
@@ -251,6 +251,11 @@ void QIcdEngine::initialize()
                                          ICD_DBUS_API_INTERFACE,
                                          QDBusConnection::systemBus(),
                                          this);
+
+    // abort if cannot connect to DBus.
+    if (!m_dbusInterface->isValid())
+        return;
+
     connect(&m_scanTimer, SIGNAL(timeout()), this, SLOT(finishAsyncConfigurationUpdate()));
     m_scanTimer.setSingleShot(true);