1 files changed, 18 insertions, 43 deletions

diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h
index f233c72c19..85d6b4d9d9 100644
--- a/src/sql/kernel/qsqldatabase.h
+++ b/src/sql/kernel/qsqldatabase.h
@@ -1,48 +1,14 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSql 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 QSQLDATABASE_H
 #define QSQLDATABASE_H
 
 #include <QtSql/qtsqlglobal.h>
+#include <QtCore/qmetaobject.h>
 #include <QtCore/qstring.h>
 
+// clazy:excludeall=qproperty-without-notify
 QT_BEGIN_NAMESPACE
 
 
@@ -52,11 +18,12 @@ class QSqlIndex;
 class QSqlRecord;
 class QSqlQuery;
 class QSqlDatabasePrivate;
+class QThread;
 
 class Q_SQL_EXPORT QSqlDriverCreatorBase
 {
 public:
-    virtual ~QSqlDriverCreatorBase() {}
+    virtual ~QSqlDriverCreatorBase();
     virtual QSqlDriver *createObject() const = 0;
 };
 
@@ -69,7 +36,10 @@ public:
 
 class Q_SQL_EXPORT QSqlDatabase
 {
+    Q_GADGET
 public:
+    Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
+
     QSqlDatabase();
     QSqlDatabase(const QSqlDatabase &other);
     ~QSqlDatabase();
@@ -84,7 +54,10 @@ public:
     QStringList tables(QSql::TableType type = QSql::Tables) const;
     QSqlIndex primaryIndex(const QString& tablename) const;
     QSqlRecord record(const QString& tablename) const;
+#if QT_DEPRECATED_SINCE(6, 6)
+    QT_DEPRECATED_VERSION_X_6_6("Use QSqlQuery::exec() instead.")
     QSqlQuery exec(const QString& query = QString()) const;
+#endif
     QSqlError lastError() const;
     bool isValid() const;
 
@@ -108,21 +81,23 @@ public:
     QString connectionName() const;
     void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy precisionPolicy);
     QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const;
+    bool moveToThread(QThread *targetThread);
+    QThread *thread() const;
 
     QSqlDriver* driver() const;
 
     static const char *defaultConnection;
 
     static QSqlDatabase addDatabase(const QString& type,
-                                 const QString& connectionName = QLatin1String(defaultConnection));
+                                 const QString& connectionName = QLatin1StringView(defaultConnection));
     static QSqlDatabase addDatabase(QSqlDriver* driver,
-                                 const QString& connectionName = QLatin1String(defaultConnection));
+                                 const QString& connectionName = QLatin1StringView(defaultConnection));
     static QSqlDatabase cloneDatabase(const QSqlDatabase &other, const QString& connectionName);
     static QSqlDatabase cloneDatabase(const QString &other, const QString& connectionName);
-    static QSqlDatabase database(const QString& connectionName = QLatin1String(defaultConnection),
+    static QSqlDatabase database(const QString& connectionName = QLatin1StringView(defaultConnection),
                                  bool open = true);
     static void removeDatabase(const QString& connectionName);
-    static bool contains(const QString& connectionName = QLatin1String(defaultConnection));
+    static bool contains(const QString& connectionName = QLatin1StringView(defaultConnection));
     static QStringList drivers();
     static QStringList connectionNames();
     static void registerSqlDriver(const QString &name, QSqlDriverCreatorBase *creator);