1 files changed, 29 insertions, 54 deletions

diff --git a/src/qml/jsruntime/qv4urlobject_p.h b/src/qml/jsruntime/qv4urlobject_p.h
index 8ac3d72a4f..d45b74fcaa 100644
--- a/src/qml/jsruntime/qv4urlobject_p.h
+++ b/src/qml/jsruntime/qv4urlobject_p.h
@@ -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
 #ifndef QV4URLOBJECT_P_H
 #define QV4URLOBJECT_P_H
 
@@ -77,7 +41,7 @@ namespace Heap {
 
 DECLARE_HEAP_OBJECT(UrlObject, Object)
 {
-    DECLARE_MARKOBJECTS(UrlObject);
+    DECLARE_MARKOBJECTS(UrlObject)
     void init() { Object::init(); }
 };
 
@@ -86,16 +50,17 @@ struct UrlCtor : FunctionObject
     void init(QV4::ExecutionContext *scope);
 };
 
-// clang-format on
+// clang-format off
 #define UrlSearchParamsObjectMembers(class, Member)                                                \
     Member(class, Pointer, ArrayObject *, params) \
     Member(class, Pointer, ArrayObject *, keys) \
-    Member(class, Pointer, ArrayObject *, values)
-// clang-format off
+    Member(class, Pointer, ArrayObject *, values) \
+    Member(class, Pointer, UrlObject *, url)
+// clang-format on
 
 DECLARE_HEAP_OBJECT(UrlSearchParamsObject, Object)
 {
-    DECLARE_MARKOBJECTS(UrlSearchParamsObject);
+    DECLARE_MARKOBJECTS(UrlSearchParamsObject)
     void init() { Object::init(); }
 };
 
@@ -111,41 +76,47 @@ struct UrlObject : Object
     Q_MANAGED_TYPE(UrlObject)
     V4_PROTOTYPE(urlPrototype)
 
-    QString hash() const { return QLatin1String("#") + d()->hash->toQString(); }
+    QString hash() const { return QLatin1String("#") + toQString(d()->hash); }
     bool setHash(QString hash);
 
-    QString host() const { return d()->host->toQString(); }
+    QString host() const { return toQString(d()->host); }
     bool setHost(QString host);
 
-    QString hostname() const { return d()->hostname->toQString(); }
+    QString hostname() const { return toQString(d()->hostname); }
     bool setHostname(QString hostname);
 
-    QString href() const { return d()->href->toQString(); }
+    QString href() const { return toQString(d()->href); }
     bool setHref(QString href);
 
-    QString origin() const { return d()->origin->toQString(); }
+    QString origin() const { return toQString(d()->origin); }
 
-    QString password() const { return d()->password->toQString(); }
+    QString password() const { return toQString(d()->password); }
     bool setPassword(QString password);
 
-    QString pathname() const { return d()->pathname->toQString(); }
+    QString pathname() const { return toQString(d()->pathname); }
     bool setPathname(QString pathname);
 
-    QString port() const { return d()->port->toQString(); }
+    QString port() const { return toQString(d()->port); }
     bool setPort(QString port);
 
-    QString protocol() const { return d()->protocol->toQString(); }
+    QString protocol() const { return toQString(d()->protocol); }
     bool setProtocol(QString protocol);
 
-    QString search() const { return QLatin1String("?") + d()->search->toQString(); }
+    Q_QML_AUTOTEST_EXPORT QString search() const;
     bool setSearch(QString search);
 
-    QString username() const { return d()->username->toQString(); }
+    QString username() const { return toQString(d()->username); }
     bool setUsername(QString username);
 
     QUrl toQUrl() const;
+    void setUrl(const QUrl &url);
 
 private:
+    static QString toQString(const Heap::String *string)
+    {
+        return string ? string->toQString() : QString();
+    }
+
     void updateOrigin();
     void updateHost();
 };
@@ -242,6 +213,10 @@ struct UrlSearchParamsObject : Object
 
     QList<QStringList> params() const;
     void setParams(QList<QStringList> params);
+    Heap::UrlObject *urlObject() const;
+    void setUrlObject(const UrlObject *url);
+
+    QString searchString() const;
 
     QString nameAt(int index) const;
     Heap::String * nameAtRaw(int index) const;