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

* '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (82 commits)
  Revert 12b6987031be9faee3886d7623888feb4e1762af
  Changed TEST_COMPILER from CC to CXX in configure script.
  doc: Fixed several qdoc errors.
  Carbon: Native filedialog does not apply filters on app-bundles
  Cocoa: Native filedialog does not apply filters on app-bundles
  Improve performance of QTimer::singleShot
  Add a benchmark comparing single shot timer with invokeMethod
  use Qt's private mac functions, reduce code redundancy
  Assistant: Fix compile warning for empty header.
  Doc: mark QEasingCurve support functions as new in 4.7.
  Modify the XML test suite not to use non-characters.
  Autotest: Fix failing QTextCodec tests
  Doc: mark methods as internal (as they were in previous releases)
  Doc: add image for Qt Quick to "What's New" page.
  qdoc: Clear a static multimap after each qdocconf file.
  qdoc: Added some debug output to track down a crash
  Fixed mouse wheel handling in scrollareas.
  Added two missing keys for X11
  Carbon: usage of menu bars can cause exceptions to be thrown
  Mac: compile fix
  ...

1 files changed, 3 insertions, 10 deletions

diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp
index 03624fa..bb81408 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp
@@ -140,7 +140,9 @@ static DBusHandlerResult signal_handler(DBusConnection *,
 				    DBUS_TYPE_STRING, &network_type,
 				    DBUS_TYPE_STRING, &state,
 				    DBUS_TYPE_INVALID) == FALSE) {
-	    qWarning() << QString("Failed to parse icd status signal: %1").arg(error.message);
+#ifdef BEARER_MANAGEMENT_DEBUG
+        qDebug() << QString("Failed to parse icd status signal: %1").arg(error.message);
+#endif
         } else {
 	    QString _iap_id(iap_id);
 	    QString _network_type(network_type);
@@ -166,7 +168,6 @@ void IcdListener::setup(QNetworkSessionPrivateImpl *d)
 
 	dbus_connection = get_dbus_conn(&error);
 	if (dbus_error_is_set(&error)) {
-	    qWarning() << "Cannot get dbus connection.";
 	    dbus_error_free(&error);
 	    return;
 	}
@@ -176,7 +177,6 @@ void IcdListener::setup(QNetworkSessionPrivateImpl *d)
 
 	dbus_bus_add_match(dbus_connection, ICD_DBUS_MATCH, &error);
 	if (dbus_error_is_set(&error)) {
-	    qWarning() << "Cannot add match" << ICD_DBUS_MATCH;
 	    dbus_error_free(&error);
 	    return;
 	}
@@ -185,7 +185,6 @@ void IcdListener::setup(QNetworkSessionPrivateImpl *d)
 						    ICD_DBUS_PATH,
 						    &icd_vtable,
 						    (void*)this) == FALSE) {
-	    qWarning() << "Cannot register dbus signal handler, interface"<< ICD_DBUS_INTERFACE << "path" << ICD_DBUS_PATH;
 	    dbus_error_free(&error);
 	    return;
 	}
@@ -340,8 +339,6 @@ void QNetworkSessionPrivateImpl::updateIdentifier(QString &newId)
     } else {
     toIcdConfig(privateConfiguration(publicConfig))->network_attrs |= ICD_NW_ATTR_IAPNAME;
     if (privateConfiguration(publicConfig)->id != newId) {
-        qWarning() << "Your config id changed from" << privateConfiguration(publicConfig)->id
-                   << "to" << newId;
         privateConfiguration(publicConfig)->id = newId;
 	}
     }
@@ -1015,25 +1012,21 @@ void QNetworkSessionPrivateImpl::stop()
 
 void QNetworkSessionPrivateImpl::migrate()
 {
-    qWarning("This platform does not support roaming (%s).", __FUNCTION__);
 }
 
 
 void QNetworkSessionPrivateImpl::accept()
 {
-    qWarning("This platform does not support roaming (%s).", __FUNCTION__);
 }
 
 
 void QNetworkSessionPrivateImpl::ignore()
 {
-    qWarning("This platform does not support roaming (%s).", __FUNCTION__);
 }
 
 
 void QNetworkSessionPrivateImpl::reject()
 {
-    qWarning("This platform does not support roaming (%s).", __FUNCTION__);
 }