From af88a7876b50ed9dd71e3fc7614eef5998908d03 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@qt.io>
Date: Tue, 6 Jul 2021 23:50:30 +0200
Subject: qmljs: update Qml parser to parser of Qt 6.2

this is needed (among other things) for
 * null coalescing
 * shebang support

Change-Id: I1b37fd86593f143de8b39c0daf433831a8785568
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/libs/qmljs/parser/qmljsengine_p.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/libs/qmljs/parser/qmljsengine_p.cpp')

diff --git a/src/libs/qmljs/parser/qmljsengine_p.cpp b/src/libs/qmljs/parser/qmljsengine_p.cpp
index 44f03a1a74..2a0482c5ea 100644
--- a/src/libs/qmljs/parser/qmljsengine_p.cpp
+++ b/src/libs/qmljs/parser/qmljsengine_p.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
@@ -26,11 +26,9 @@
 #include "qmljsengine_p.h"
 #include "qmljsglobal_p.h"
 
-#include <utils/porting.h>
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qhash.h>
 #include <QtCore/qnumeric.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qdebug.h>
 
 QT_QML_BEGIN_NAMESPACE
 
@@ -138,9 +136,7 @@ QStringView Engine::newStringRef(const QString &text)
 }
 
 QStringView Engine::newStringRef(const QChar *chars, int size)
-{
-    return newStringRef(QString(chars, size));
-}
+{ return newStringRef(QString(chars, size)); }
 
 } // end of namespace QmlJS
 
-- 
cgit v1.2.1