From 65f747c8f81fbf70f48182556d0f463976da3121 Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Tue, 29 Mar 2022 16:20:16 +0200 Subject: [PATCH] Prevent DS from hanging when adding a signal handler Fixes: QDS-6547 Change-Id: I28d73f88482f4b8eab8222420f0fd513b960c0b5 Reviewed-by: Reviewed-by: Thomas Hartmann Reviewed-by: Qt CI Bot --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index ad3c1693304..6eb2faa02e6 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -924,6 +924,10 @@ static QList generatePossibleFileImports(const QString &pat std::function checkDir; checkDir = [&](const QString &checkPath) { + + if (QFileInfo(checkPath).isRoot()) + return; + const QStringList entries = QDir(checkPath).entryList(QDir::Dirs | QDir::NoDot | QDir::NoDotDot); const QString checkPathDelim = checkPath + delimeter; for (const QString &entry : entries) { @@ -1007,7 +1011,8 @@ void TextToModelMerger::setupPossibleImports(const QmlJS::Snapshot &snapshot, co QList possibleImports = generatePossibleLibraryImports(filteredPossibleImportKeys); - possibleImports.append(generatePossibleFileImports(document()->path(), imports->all())); + if (document()->fileName() != "") + possibleImports.append(generatePossibleFileImports(document()->path(), imports->all())); if (m_rewriterView->isAttached()) m_rewriterView->model()->setPossibleImports(possibleImports);