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

QmlDesigner: QT_NO_CAST_FROM_ASCII fixes

Browse Source 
Change-Id: I45cd69bb863dbf7fc51f6d64fa4b2509c0e2ecee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-16 17:06:52 +02:00
committed by Thomas Hartmann
parent cad4ee7116
commit 893dfade18
19 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -120,7 +120,7 @@ static ComponentTextModifier *createComponentTextModifier(TextModifier *original
const QString &componentText,
const ModelNode &componentNode)
{
bool explicitComponent = componentText.contains("Component");
bool explicitComponent = componentText.contains(QLatin1String("Component"));
ModelNode rootModelNode = rewriterView->rootModelNode();
@@ -406,7 +406,7 @@ void DesignDocument::copySelected()
node.destroy();
}
view.changeRootNodeType("QtQuick.Rectangle", 1, 0);
view.rootModelNode().setIdWithRefactoring("designer__Selection");
view.rootModelNode().setIdWithRefactoring(QLatin1String("designer__Selection"));
foreach (const ModelNode &selectedNode, selectedNodes) {
ModelNode newNode(view.insertModel(selectedNode));
@@ -477,7 +477,7 @@ void DesignDocument::paste()
if (rootNode.type() == "empty")
return;
if (rootNode.id() == "designer__Selection") {
if (rootNode.id() == QLatin1String("designer__Selection")) {
QList<ModelNode> selectedNodes = rootNode.directSubModelNodes();
pasteModel->detachView(&view);
currentModel()->attachView(&view);