diff options
Diffstat (limited to 'src/libs/qmljs/qmljslink.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index a079b51753..8f20b447d2 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -4,28 +4,27 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** +** Other Usage +** +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. ** @@ -347,8 +346,16 @@ bool Link::importLibrary(Document::Ptr doc, Interpreter::ObjectValue *import, tr("Library contains C++ plugins, type dump is in progress.")); } } else if (libraryInfo.dumpStatus() == LibraryInfo::DumpError) { - if (errorLoc.isValid()) { - error(doc, errorLoc, libraryInfo.dumpError()); + ModelManagerInterface *modelManager = ModelManagerInterface::instance(); + + // Only underline import if package/version isn't described in .qmltypes anyway + const QmlJS::ModelManagerInterface::BuiltinPackagesHash builtinPackages + = modelManager->builtinPackages(); + const QString packageName = importInfo.name().replace(QDir::separator(), QLatin1Char('.')); + if (!builtinPackages.value(packageName).contains(importInfo.version())) { + if (errorLoc.isValid()) { + error(doc, errorLoc, libraryInfo.dumpError()); + } } } else { QList<QmlObjectValue *> loadedObjects = |