From a6ae570c3173340e81921c94835358e343ba1daa Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 10 Aug 2011 09:00:40 +0200 Subject: [PATCH] QmlJS: Move 'file not found' error message from Bind to Link. Change-Id: I701fc179f377581b87e31630eaa4231688152f5e Reviewed-on: http://codereview.qt.nokia.com/2813 Reviewed-by: Leandro T. C. Melo --- src/libs/qmljs/qmljsbind.cpp | 2 -- src/libs/qmljs/qmljslink.cpp | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp index c7a2437ac08..fac27389d7f 100644 --- a/src/libs/qmljs/qmljsbind.cpp +++ b/src/libs/qmljs/qmljsbind.cpp @@ -278,8 +278,6 @@ bool Bind::visit(UiImport *ast) else if (importFileInfo.isDir()) type = ImportInfo::DirectoryImport; else { - _diagnosticMessages->append( - errorMessage(ast, tr("file or directory not found"))); type = ImportInfo::UnknownFileImport; } } diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index 7bbf6abd5ff..7c2eaaa8166 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -221,6 +221,10 @@ void Link::populateImportedTypes(Imports *imports, Document::Ptr doc) case ImportInfo::LibraryImport: import = importNonFile(doc, info); break; + case ImportInfo::UnknownFileImport: + error(doc, info.ast()->fileNameToken, + tr("file or directory not found")); + break; default: break; }