Marco Bubke
94bc93d101
QmlDesigner.NodeInstance: Add instance wrapper for anchor changes
...
Task-number: QTCREATORBUG-5026
Change-Id: I56116fc3f1823e41bfd8e50781d2b4e8fccbfe04
Reviewed-on: http://codereview.qt.nokia.com/1329
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Marco Bubke <marco.bubke@nokia.com >
2011-07-07 20:07:52 +02:00
Marco Bubke
39e55c91e7
QmlDesigner.NodeInstances: Remove dead code
...
Change-Id: I181f365d40b9fcd6b09989ed54decd9720e1c27d
Reviewed-on: http://codereview.qt.nokia.com/1330
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com >
2011-07-07 19:22:35 +02:00
Oswald Buddenhagen
1f3896e8af
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
share/qtcreator/dumper/bridge.py
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
2011-07-07 12:26:59 +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
765ba3b4b9
QmlDesigner: Prevent item hoping for reparenting
...
Because of the asynchronous nature of the formeditor the item can be between
to states. This looks like the item is hoping around. To prevent this a token
is sent to the instances and back. For the time frame the painting is disabled.
Change-Id: If7e937cba8171248464ad350bb14438c020b25f9
Reviewed-on: http://codereview.qt.nokia.com/1189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com >
2011-07-06 18:19:28 +02:00
Thomas Hartmann
3cfa376243
QmlDesigner: Fix wrong position for reparenting
...
Change-Id: Ie9d9a739e559d5cfc06849ff3e5c086e9ab2224c
DoneBy: Marco Bubke
Task-number: QTCREATORBUG-3962
Reviewed-on: http://codereview.qt.nokia.com/958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com >
2011-06-30 17:36:09 +02:00
Thomas Hartmann
08e4b339f1
QmlDesigner.instances: allow fallback to item
...
If we know from the (text editor) meta system that an object is an
(visible) item, we always create an item as fallback.
We might not be able to instaciate the original item.
Change-Id: I6851cd7a8de68d9d09b789927c204f0617017de7
Reviewed-on: http://codereview.qt.nokia.com/829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Marco Bubke <marco.bubke@nokia.com >
2011-06-28 13:36:48 +02:00
Oswald Buddenhagen
1d78e594d8
Merge branch '2.2'
...
Conflicts:
qtcreator.pri
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
src/libs/qmljs/qmljsdocument.cpp
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/libs/qmljs/qmljslink.cpp
src/plugins/cppeditor/cppquickfixes.cpp
src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
src/plugins/qmldesigner/qmldesigner.pro
src/plugins/qmldesigner/symbianplugin/symbian.metainfo
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
2011-06-23 19:47:50 +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
