Merge remote branch 'qt/4.8' into master-qml-staging
authorKai Koehne <kai.koehne@nokia.com>
Tue, 10 May 2011 13:14:16 +0000 (15:14 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Tue, 10 May 2011 13:14:16 +0000 (15:14 +0200)
commitbaecfbc7f7e0ec7edddb74a2e760c685977e9084
treef9071063e3b8dfcc1b2fcb3236be84fce5b17091
parentbde58ad1e7d2b38d2882aaf869e93b0415128836
parentf3ddd2d995b7485cdc1c3420d254499904ff9dd9
Merge remote branch 'qt/4.8' into master-qml-staging

Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro
src/declarative/debugger/qdeclarativedebugserver.cpp
src/declarative/qml/qdeclarativeenginedebug.cpp
src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
src/plugins/qmltooling/qmltooling.pro
tools/qml/qml.pro