diff options
| author | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2021-07-06 23:50:30 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2021-07-20 09:02:15 +0000 |
| commit | af88a7876b50ed9dd71e3fc7614eef5998908d03 (patch) | |
| tree | 8d8345ea2962a11579b3802ce68df6732c290674 /src/libs/qmljs/parser/qmljsengine_p.cpp | |
| parent | dc654cfcba7f1c446ea1bd32e326d3f8c747cf4f (diff) | |
| download | qt-creator-af88a7876b50ed9dd71e3fc7614eef5998908d03.tar.gz | |
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>
Diffstat (limited to 'src/libs/qmljs/parser/qmljsengine_p.cpp')
| -rw-r--r-- | src/libs/qmljs/parser/qmljsengine_p.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
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 |