From d942111ace53d28f1bd1e7340ca73b5b6b1af97c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 22 Nov 2016 16:16:57 +0100 Subject: [PATCH] QmlDesigner: Fix manual puppet build The overload for the "+" operator is ambiguous. Change-Id: Iaebd889ef2eaed6e2d4261ecbd9555a6ba73c521 Reviewed-by: Tim Jenssen --- .../qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp index fd1278c70e0..875c80d3781 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp @@ -455,7 +455,7 @@ void NodeInstanceServer::setupImports(const QVector &contain if (!container.alias().isEmpty()) importStatement += " as " + container.alias(); - if (importStatement.startsWith("import QtQuick" + QChar(QChar::Space))) + if (importStatement.startsWith(QLatin1String("import QtQuick") + QChar(QChar::Space))) qtQuickImport = importStatement; else importStatementSet.insert(importStatement);