Oswald Buddenhagen
|
ae8ac2eb2f
|
Merge branch '2.3'
Conflicts:
qtcreator.pri
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/remotelinux/maemodeploystepfactory.cpp
src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp
Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
|
2011-07-25 13:57:13 +02:00 |
|
Marco Bubke
|
c6a7091c8a
|
QmlDesigner.NodeInstances: Fix line feed handling
Task-number: QTCREATORBUG-4161
Change-Id: I61d765bedffde4d1f15e763d92b771f22dbcd4a2
Reviewed-on: http://codereview.qt.nokia.com/1849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
2011-07-20 13:06:18 +02:00 |
|
Marco Bubke
|
d1b3b66d5a
|
QmlDesigner: Fix positioner handling
Change-Id: I519bbbfee939d4568a0de5bbe5c01912a08c6fb1
Reviewed-on: http://codereview.qt.nokia.com/1848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
2011-07-20 13:06:12 +02:00 |
|
Eike Ziller
|
e5ca4b3462
|
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
share/qtcreator/dumper/dumper.py
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/valgrind/valgrind.pro
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
|
2011-07-15 14:29:07 +02:00 |
|
Marco Bubke
|
8a5fffb945
|
QmlDesigner.NodeInstances: Fix restore bindings for reset
Task-number: QTCREATORBUG-5415
Change-Id: I1cbc8dda5eb1512db52a2767837b53eb136dc387
Reviewed-on: http://codereview.qt.nokia.com/1664
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
2011-07-14 16:53:08 +02:00 |
|
Marco Bubke
|
2ebb5137a0
|
QmlDesigner.NodeInstances: Wouraround invisible root items
Task-number: QTCREATORBUG-5152
Change-Id: I40be95844598a3a3728d0c7fbe88a9fe7a155c53
Reviewed-on: http://codereview.qt.nokia.com/1532
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
2011-07-12 16:11:07 +02:00 |
|
hjk
|
402db14943
|
qmlpuppet: remove unneeded declarations
Change-Id: I488548fa84e743e0ed80dd68739d3d80a1cea92b
Reviewed-on: http://codereview.qt.nokia.com/1297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
2011-07-07 11:57:55 +02:00 |
|
Marco Bubke
|
8fe3302329
|
QmlDesigner.NodeInstances: Move qmlpuppet to share
Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
2011-06-22 18:24:36 +02:00 |
|