1 files changed, 13 insertions, 43 deletions

diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index 5864c3245c..1cc734206e 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -1,48 +1,10 @@
-/****************************************************************************
-**
-** 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
 
 #include "qqmlexpression.h"
 #include "qqmlexpression_p.h"
 
-#include "qqmlglobal_p.h"
 #include "qqmlengine_p.h"
-#include "qqmlcontext_p.h"
 #include "qqmlscriptstring_p.h"
 #include "qqmlbinding_p.h"
 #include <private/qqmlsourcecoordinate_p.h>
@@ -143,6 +105,14 @@ QQmlExpression::QQmlExpression(const QQmlScriptString &script, QQmlContext *ctxt
         return;
 
     const QQmlScriptStringPrivate *scriptPrivate = script.d.data();
+    if (!scriptPrivate) {
+        // A null QQmlScriptStringPrivate is an empty expression without context.
+        // We may still want the explicitly passed context, though.
+        if (ctxt)
+            d->init(QQmlContextData::get(ctxt), QString(), scope);
+        return;
+    }
+
     if (!ctxt && (!scriptPrivate->context || !scriptPrivate->context->isValid()))
         return;
 
@@ -206,7 +176,7 @@ QQmlExpression::~QQmlExpression()
 }
 
 /*!
-    Returns the QQmlEngine this expression is associated with, or 0 if there
+    Returns the QQmlEngine this expression is associated with, or \nullptr if there
     is no association or the QQmlEngine has been destroyed.
 */
 QQmlEngine *QQmlExpression::engine() const
@@ -216,7 +186,7 @@ QQmlEngine *QQmlExpression::engine() const
 }
 
 /*!
-    Returns the QQmlContext this expression is associated with, or 0 if there
+    Returns the QQmlContext this expression is associated with, or \nullptr if there
     is no association or the QQmlContext has been destroyed.
 */
 QQmlContext *QQmlExpression::context() const
@@ -281,7 +251,7 @@ QVariant QQmlExpressionPrivate::value(bool *isUndefined)
         QV4::Scope scope(engine->handle());
         QV4::ScopedValue result(scope, v4value(isUndefined));
         if (!hasError())
-            rv = scope.engine->toVariant(result, -1);
+            rv = QV4::ExecutionEngine::toVariant(result, QMetaType {});
     }
 
     ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete.