1 files changed, 32 insertions, 54 deletions

diff --git a/src/qml/qmldirparser/qqmldirparser_p.h b/src/qml/qmldirparser/qqmldirparser_p.h
index eabaceae91..deef8f2dcf 100644
--- a/src/qml/qmldirparser/qqmldirparser_p.h
+++ b/src/qml/qmldirparser/qqmldirparser_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QQMLDIRPARSER_P_H
 #define QQMLDIRPARSER_P_H
@@ -61,18 +25,19 @@
 QT_BEGIN_NAMESPACE
 
 class QQmlEngine;
-class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlDirParser
+class Q_QML_COMPILER_EXPORT QQmlDirParser
 {
 public:
     void clear();
     bool parse(const QString &source);
+    void disambiguateFileSelectors();
 
-    bool hasError() const;
+    bool hasError() const { return !_errors.isEmpty(); }
     void setError(const QQmlJS::DiagnosticMessage &);
     QList<QQmlJS::DiagnosticMessage> errors(const QString &uri) const;
 
-    QString typeNamespace() const;
-    void setTypeNamespace(const QString &s);
+    QString typeNamespace() const { return _typeNamespace; }
+    void setTypeNamespace(const QString &s) { _typeNamespace = s; }
 
     static void checkNonRelative(const char *item, const QString &typeName, const QString &fileName)
     {
@@ -134,9 +99,11 @@ public:
     struct Import
     {
         enum Flag {
-            Default  = 0x0,
-            Auto     = 0x1, // forward the version of the importing module
-            Optional = 0x2  // is not automatically imported but only a tooling hint
+            Default = 0x0,
+            Auto = 0x1, // forward the version of the importing module
+            Optional = 0x2, // is not automatically imported but only a tooling hint
+            OptionalDefault =
+                    0x4, // tooling hint only, denotes this entry should be imported by tooling
         };
         Q_DECLARE_FLAGS(Flags, Flag)
 
@@ -149,18 +116,26 @@ public:
         QString module;
         QTypeRevision version;     // invalid version is latest version, unless Flag::Auto
         Flags flags;
+
+        friend bool operator==(const Import &a, const Import &b)
+        {
+            return a.module == b.module && a.version == b.version && a.flags == b.flags;
+        }
     };
 
-    QMultiHash<QString,Component> components() const;
-    QList<Import> dependencies() const;
-    QList<Import> imports() const;
-    QList<Script> scripts() const;
-    QList<Plugin> plugins() const;
-    bool designerSupported() const;
+    QMultiHash<QString,Component> components() const { return _components; }
+    QList<Import> dependencies() const { return _dependencies; }
+    QList<Import> imports() const { return _imports; }
+    QList<Script> scripts() const { return _scripts; }
+    QList<Plugin> plugins() const { return _plugins; }
+    bool designerSupported() const { return _designerSupported; }
+    bool isStaticModule() const { return _isStaticModule; }
+    bool isSystemModule() const { return _isSystemModule; }
 
-    QStringList typeInfos() const;
-    QStringList classNames() const;
-    QString preferredPath() const;
+    QStringList typeInfos() const { return _typeInfos; }
+    QStringList classNames() const { return _classNames; }
+    QString preferredPath() const { return _preferredPath; }
+    QString linkTarget() const { return _linkTarget; }
 
 private:
     bool maybeAddComponent(const QString &typeName, const QString &fileName, const QString &version, QHash<QString,Component> &hash, int lineNumber = -1, bool multi = true);
@@ -176,8 +151,11 @@ private:
     QList<Script> _scripts;
     QList<Plugin> _plugins;
     bool _designerSupported = false;
+    bool _isStaticModule = false;
+    bool _isSystemModule = false;
     QStringList _typeInfos;
     QStringList _classNames;
+    QString _linkTarget;
 };
 
 using QQmlDirComponents = QMultiHash<QString,QQmlDirParser::Component>;