feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
This commit is contained in:
Eike Ziller
2013-05-03 09:49:28 +02:00
parent 364c95476e 6999e3c339
commit a2171c2d82
37 changed files with 178 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
View File

@@ -12,6 +12,8 @@
#include <private/qquicktextinput_p.h>
#include <private/qquicktextedit_p.h>
#include <designersupport.h>
namespace QmlDesigner {
namespace Internal {
@@ -499,6 +501,10 @@ void GraphicalNodeInstance::doComponentComplete()
disableTextCursor(quickItem());
#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0))
DesignerSupport::emitComponentCompleteSignalForAttachedProperty(quickItem());
#endif
quickItem()->update();
}