summaryrefslogtreecommitdiff
path: root/share/qtcreator/qml/qmlpuppet/commands/commands.pri
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@nokia.com>2011-07-06 15:48:21 +0200
committerMarco Bubke <marco.bubke@nokia.com>2011-07-06 18:19:28 +0200
commit765ba3b4b99c289b268907b9fefffad545fdb120 (patch)
treea304e3ae8904b32edf58516bce08a712632b817c /share/qtcreator/qml/qmlpuppet/commands/commands.pri
parenta4c4d67772cf243e9f694e78129bf9a24d0304b0 (diff)
downloadqt-creator-765ba3b4b99c289b268907b9fefffad545fdb120.tar.gz
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>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/commands/commands.pri')
-rw-r--r--share/qtcreator/qml/qmlpuppet/commands/commands.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/commands/commands.pri b/share/qtcreator/qml/qmlpuppet/commands/commands.pri
index c6c9282d1b..5ae623cf3f 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/commands.pri
+++ b/share/qtcreator/qml/qmlpuppet/commands/commands.pri
@@ -1,6 +1,7 @@
INCLUDEPATH += $$PWD/
HEADERS += $$PWD/synchronizecommand.h
+HEADERS += $$PWD/tokencommand.h
HEADERS += $$PWD/componentcompletedcommand.h
HEADERS += $$PWD/completecomponentcommand.h
HEADERS += $$PWD/statepreviewimagechangedcommand.h
@@ -24,6 +25,7 @@ HEADERS += $$PWD/changeauxiliarycommand.h
SOURCES += $$PWD/synchronizecommand.cpp
+SOURCES += $$PWD/tokencommand.cpp
SOURCES += $$PWD/componentcompletedcommand.cpp
SOURCES += $$PWD/completecomponentcommand.cpp
SOURCES += $$PWD/statepreviewimagechangedcommand.cpp