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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
This commit is contained in:
Eike Ziller
2014-11-24 15:43:48 +01:00
parent 63487158f1 a4a4f7a475
commit a47fbb8309
310 changed files with 5678 additions and 8466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
View File

@@ -36,6 +36,7 @@
#include <QQuickView>
#include <cmath>
#include <private/qquicktext_p.h>
#include <private/qquicktextinput_p.h>
#include <private/qquicktextedit_p.h>
@@ -191,6 +192,21 @@ bool QuickItemNodeInstance::hasContent() const
return childItemsHaveContent(quickItem());
}
static void disableNativeTextRendering(QQuickItem *item)
{
QQuickText *text = qobject_cast<QQuickText*>(item);
if (text)
text->setRenderType(QQuickText::QtRendering);
QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(item);
if (textInput)
textInput->setRenderType(QQuickTextInput::QtRendering);
QQuickTextEdit *textEdit = qobject_cast<QQuickTextEdit*>(item);
if (textEdit)
textEdit->setRenderType(QQuickTextEdit::QtRendering);
}
static void disableTextCursor(QQuickItem *item)
{
foreach (QQuickItem *childItem, item->childItems())
@@ -464,6 +480,7 @@ void QuickItemNodeInstance::updateDirtyNodesRecursive(QQuickItem *parentItem) co
updateDirtyNodesRecursive(childItem);
}
disableNativeTextRendering(parentItem);
DesignerSupport::updateDirtyNode(parentItem);
}