Merge branch 'master' into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 6 Jun 2011 05:19:50 +0000 (15:19 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 6 Jun 2011 05:19:50 +0000 (15:19 +1000)
commit6e22ead1767d0ef9463b34bee071ca54647a547c
treee347fbc15f8695027930eac80ea9a437229cb57b
parent6dbd4286eb19e9ac45665046a43342bcdc8b127e
parentb6b1aebf480ef84d8b2b3a7fc338493811cc2ee0
Merge branch 'master' into qtquick2

Conflicts:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/debugger/qdeclarativedebugserver.cpp
src/declarative/declarative.pro
src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeengine_p.h
src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
sync.profile