summaryrefslogtreecommitdiffstats
path: root/src/dbus/doc/src/qt6-changes.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbus/doc/src/qt6-changes.qdoc')
-rw-r--r--src/dbus/doc/src/qt6-changes.qdoc58
1 files changed, 28 insertions, 30 deletions
diff --git a/src/dbus/doc/src/qt6-changes.qdoc b/src/dbus/doc/src/qt6-changes.qdoc
index ef0620df46..80cd56c627 100644
--- a/src/dbus/doc/src/qt6-changes.qdoc
+++ b/src/dbus/doc/src/qt6-changes.qdoc
@@ -1,35 +1,11 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
\page dbus-changes-qt6.html
- \title Porting to Qt 6 - Qt DBus
- \ingroup porting-guides-5-to-6
- \brief Migrate Qt DBus to Qt 6.
+ \title Changes to Qt D-Bus
+ \ingroup changes-qt-5-to-6
+ \brief Minimal porting effort to be able to switch to Qt 6.
Qt 6 is a result of the conscious effort to make the framework more
efficient and easy to use.
@@ -41,6 +17,28 @@
In this topic we summarize those changes in Qt DBus, and provide
guidance to handle them.
- \section1 ADD STUFF HERE
+ \section1 API changes
+ The QtDBus module has undergone some basic consolidation and
+ cleanup. There should be minimal porting effort to be able to switch to Qt6.
+
+ \section2 The QDBusMessage class
+ The QDBusMessage::call() and QDBusMessage::asyncCall() methods with a fixed
+ size of arguments have been removed in Qt6.
+
+ \section2 The QDBusArgument class
+ The QDBusArgument::operator<<() specializations for QHash, QMap and QList
+ have been unified into common specializations for associative containers.
+
+ \section2 The QDBusConnection class
+ The QDBusConnection::sender() function has been removed in Qt6.
+
+ \section2 The QDBusMessage class
+ The QDBusMessage::createErrorReply() function now takes the QString \c name
+ argument by const reference instead of taking by value.
+
+ \section2 The QDBusPendingReply class
+ QDBusPendingReply has been changed to be a variadic template class in order
+ to support more than 8 template parameters now. The template parameters
+ are the types that will be used to extract the contents of the reply's data.
*/