From 97f8ec24fa1cfce7efdf96ab5ab779fff6940bf9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 8 Nov 2017 15:05:06 +0100 Subject: Fix import search path precedence Items located lower in the search path stack would overwrite existing, higher-priorized entries. Change-Id: Ie7660428cf6f0969bf880941344a9f88cdb51021 Reviewed-by: Joerg Bornemann --- src/lib/corelib/language/astimportshandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/corelib/language/astimportshandler.cpp b/src/lib/corelib/language/astimportshandler.cpp index 783b67dfe..c4c701f22 100644 --- a/src/lib/corelib/language/astimportshandler.cpp +++ b/src/lib/corelib/language/astimportshandler.cpp @@ -232,7 +232,8 @@ bool ASTImportsHandler::addPrototype(const QString &fileName, const QString &fil if (!as.isEmpty()) prototypeName.append(as); prototypeName.append(componentName); - m_typeNameToFile.insert(prototypeName, filePath); + if (!m_typeNameToFile.contains(prototypeName)) + m_typeNameToFile.insert(prototypeName, filePath); return true; } -- cgit v1.2.1