Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Adapt autotests to commit e2773a9
  Declarative: Use qDebug() for debugger status updates
  Declarative: Unify output of warning messages in debug server

1 files changed, 1 insertions, 1 deletions

diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
index 283f7d4..36946d2 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
@@ -152,7 +152,7 @@ void QTcpServerConnection::listen()
     d->tcpServer = new QTcpServer(this);
     QObject::connect(d->tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
     if (d->tcpServer->listen(QHostAddress::Any, d->port)) {
-        qWarning("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port);
+        qDebug("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port);
     } else {
         qWarning("QDeclarativeDebugServer: Unable to listen on port %d", d->port);
     }