1 files changed, 67 insertions, 67 deletions

diff --git a/src/qmldom/qqmldom_fwd_p.h b/src/qmldom/qqmldom_fwd_p.h
index a8b54b1e51..9b8603b33e 100644
--- a/src/qmldom/qqmldom_fwd_p.h
+++ b/src/qmldom/qqmldom_fwd_p.h
@@ -1,40 +1,6 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 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) 2020 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 QQMLDOM_FWD_P_H
 #define QQMLDOM_FWD_P_H
 
@@ -50,53 +16,87 @@
 //
 
 #include "qqmldom_global.h"
+#include "private/qglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace QQmlJS {
 namespace Dom {
 
-class ExternalItemInfoBase;
-class ExternalItemPairBase;
-class ExternalOwningItem;
-class OwningItem;
+class AstComments;
+class AttachedInfo;
+class Binding;
+class Comment;
+class CommentedElement;
+class ConstantData;
 class DomBase;
+enum DomCreationOption : char;
+class DomEnvironment;
 class DomItem;
-class Source;
+class DomTop;
+class DomUniverse;
 class Empty;
-class QmlDirectory;
+class EnumDecl;
+class Export;
+class ExternalItemInfoBase;
+class ExternalItemPairBase;
+class ExternalOwningItem;
+class FileLocations;
+enum FileLocationRegion : int;
+class FileWriter;
+class GlobalComponent;
+class GlobalScope;
+class MockObject;
+class MockOwner;
+class Id;
+class Import;
 class JsFile;
-class QmlFile;
-class QmltypesFile;
+class JsResource;
+class List;
+class LoadInfo;
+class Map;
+class MethodInfo;
 class ModuleIndex;
 class ModuleScope;
-class Export;
-class JsResource;
-class QmltypesComponent;
-class QmlComponent;
-class EnumDecl;
-class Import;
+class MutableDomItem;
+class ObserversTrie;
+class OutWriter;
+class OutWriterState;
+class OwningItem;
+class Path;
 class Pragma;
-class Id;
+class PropertyDefinition;
+class PropertyInfo;
+class QQmlDomAstCreator;
+class QmlComponent;
+class QmlDirectory;
+class QmldirFile;
+class QmlFile;
 class QmlObject;
-class ConstantData;
-class ScriptExpression;
+class QmltypesComponent;
+class QmltypesFile;
 class Reference;
-class Binding;
-class PropertyDefinition;
-class RequiredProperty;
-class Version;
-class MethodInfo;
-class GenericObject;
-class Map;
-class List;
+class RegionComments;
+class ScriptExpression;
+class Source;
+class TestDomItem;
 class Version;
-class DomTop;
-class DomEnvironment;
-class DomUniverse;
 
-class Subpath;
-class ObserversTrie;
+namespace ScriptElements {
+class BlockStatement;
+class IdentifierExpression;
+class Literal;
+class ForStatement;
+class IfStatement;
+class BinaryExpression;
+class VariableDeclaration;
+class VariableDeclarationEntry;
+class GenericScriptElement;
+// TODO: add new script classes here, as qqmldomitem_p.h cannot include qqmldomscriptelements_p.h
+// without creating circular dependencies
+class ReturnStatement;
+
+} // end namespace ScriptElements
 
 } // end namespace Dom
 } // end namespace QQmlJS