1 files changed, 17 insertions, 47 deletions

diff --git a/src/qml/qml/qqmlscriptstring.cpp b/src/qml/qml/qqmlscriptstring.cpp
index 3230e69b6d..9f47841031 100644
--- a/src/qml/qml/qqmlscriptstring.cpp
+++ b/src/qml/qml/qqmlscriptstring.cpp
@@ -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
 
 #include "qqmlscriptstring.h"
 #include "qqmlscriptstring_p.h"
@@ -80,7 +44,7 @@ const QQmlScriptStringPrivate* QQmlScriptStringPrivate::get(const QQmlScriptStri
 Constructs an empty instance.
 */
 QQmlScriptString::QQmlScriptString()
-:  d(new QQmlScriptStringPrivate)
+:  d()
 {
 }
 
@@ -128,6 +92,8 @@ bool QQmlScriptString::operator==(const QQmlScriptString &other) const
 {
     if (d == other.d)
         return true;
+    if (!d || !other.d)
+        return false;
 
     if (d->isNumberLiteral || other.d->isNumberLiteral)
         return d->isNumberLiteral && other.d->isNumberLiteral && d->numberValue == other.d->numberValue;
@@ -162,6 +128,8 @@ Returns whether the QQmlScriptString is empty.
 */
 bool QQmlScriptString::isEmpty() const
 {
+    if (!d)
+        return true;
     if (!d->script.isEmpty())
         return false;
     return d->bindingId == -1;
@@ -172,7 +140,7 @@ Returns whether the content of the QQmlScriptString is the \c undefined literal.
 */
 bool QQmlScriptString::isUndefinedLiteral() const
 {
-    return d->script == QLatin1String("undefined");
+    return d && d->script == QLatin1String("undefined");
 }
 
 /*!
@@ -180,7 +148,7 @@ Returns whether the content of the QQmlScriptString is the \c null literal.
 */
 bool QQmlScriptString::isNullLiteral() const
 {
-    return d->script == QLatin1String("null");
+    return d && d->script == QLatin1String("null");
 }
 
 /*!
@@ -189,8 +157,8 @@ Otherwise returns a null QString.
 */
 QString QQmlScriptString::stringLiteral() const
 {
-    if (d->isStringLiteral)
-        return d->script.mid(1, d->script.length()-2);
+    if (d && d->isStringLiteral)
+        return d->script.mid(1, d->script.size()-2);
     return QString();
 }
 
@@ -201,8 +169,8 @@ sets \a ok to true. Otherwise returns 0.0 and sets \a ok to false.
 qreal QQmlScriptString::numberLiteral(bool *ok) const
 {
     if (ok)
-        *ok = d->isNumberLiteral;
-    return d->isNumberLiteral ? d->numberValue : 0.;
+        *ok = d && d->isNumberLiteral;
+    return (d && d->isNumberLiteral) ? d->numberValue : 0.;
 }
 
 /*!
@@ -211,8 +179,8 @@ sets \a ok to true. Otherwise returns false and sets \a ok to false.
 */
 bool QQmlScriptString::booleanLiteral(bool *ok) const
 {
-    bool isTrue = d->script == QLatin1String("true");
-    bool isFalse = !isTrue && d->script == QLatin1String("false");
+    bool isTrue = d && d->script == QLatin1String("true");
+    bool isFalse = !isTrue && d && d->script == QLatin1String("false");
     if (ok)
         *ok = isTrue || isFalse;
     return isTrue ? true : false;
@@ -220,3 +188,5 @@ bool QQmlScriptString::booleanLiteral(bool *ok) const
 
 QT_END_NAMESPACE
 
+#include "moc_qqmlscriptstring.cpp"
+