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

QmlDesigner: fix endless loop in check import code

Browse Source 
Change-Id: Id1255ed1fd544e0eed75aeeeb2ffb3df8f75dc84
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-11-21 15:58:23 +01:00
committed by Thomas Hartmann
parent bb4b0c8af8
commit 571168f9fb
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+10 -2
View File
@@ -82,7 +82,7 @@
#include <QAbstractAnimation>
#include <QMutableVectorIterator>
#include <QQuickView>
#include <QSet>
#include <designersupportdelegate.h>
#include <algorithm>
@@ -110,6 +110,14 @@ bool testImportStatements(const QStringList &importStatementList, const QUrl &ur
void sortFilterImports(const QStringList &imports, QStringList *workingImports, QStringList *failedImports, const QUrl &url, QString *errorMessage)
{
static QSet<QString> visited;
QString visitedId("imports: %1, workingImports: %2, failedImports: %3");
visitedId = visitedId.arg(imports.join(""), workingImports->join(""), failedImports->join(""));
if (visited.contains(visited))
return;
else
visited.insert(visitedId);
for (const QString &import : imports) {
const QStringList alreadyTestedImports = *workingImports + *failedImports;
if (!alreadyTestedImports.contains(import)) {
@@ -481,8 +489,8 @@ void NodeInstanceServer::setupOnlyWorkingImports(const QStringList &workingImpor
delete m_importComponent;
m_importComponent = new QQmlComponent(engine(), quickView());
m_importComponent->setData("import QtQuick 2.0\n\nItem {}\n", fileUrl());
sendDebugOutput(DebugOutputCommand::WarningType, tr("No working QtQuick import"));
m_importComponentObject = m_importComponent->create();
sendDebugOutput(DebugOutputCommand::WarningType, m_importComponent->errorString());
}
Q_ASSERT(m_importComponent && m_importComponentObject);