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

QmlDesigner: Fix manual puppet build

Browse Source 
The overload for the "+" operator is ambiguous.

Change-Id: Iaebd889ef2eaed6e2d4261ecbd9555a6ba73c521
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-11-22 16:16:57 +01:00
committed by Tim Jenssen
parent dc87f6a41a
commit d942111ace
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -455,7 +455,7 @@ void NodeInstanceServer::setupImports(const QVector<AddImportContainer> &contain
if (!container.alias().isEmpty()) if (!container.alias().isEmpty())
importStatement += " as " + container.alias(); importStatement += " as " + container.alias();
if (importStatement.startsWith("import QtQuick" + QChar(QChar::Space))) if (importStatement.startsWith(QLatin1String("import QtQuick") + QChar(QChar::Space)))
qtQuickImport = importStatement; qtQuickImport = importStatement;
else else
importStatementSet.insert(importStatement); importStatementSet.insert(importStatement);