From 9828559a3dd7bf07e603e0ff5bee4520dbfd93d9 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Mon, 16 Nov 2020 10:55:40 +0100 Subject: Several fixes to porting guides MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I46b1754103d33d21e6cdeb338e3c6e3b0d0a4e29 Reviewed-by: Mårten Nordheim --- src/dbus/doc/src/qt6-changes.qdoc | 6 ++++-- src/network/doc/src/qt6-changes.qdoc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dbus/doc/src/qt6-changes.qdoc b/src/dbus/doc/src/qt6-changes.qdoc index 14cd728c19..d03f9f1d9a 100644 --- a/src/dbus/doc/src/qt6-changes.qdoc +++ b/src/dbus/doc/src/qt6-changes.qdoc @@ -41,7 +41,9 @@ In this topic we summarize those changes in Qt DBus, and provide guidance to handle them. - \section1 The QtDBus module has undergone some basic consolidation and + \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 QDBusMessage @@ -60,7 +62,7 @@ argument by const reference instead of taking by value. \section2 QDBusPendingReply - QDBusPendingReply has been changed to be a varadic template class in order + 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. */ diff --git a/src/network/doc/src/qt6-changes.qdoc b/src/network/doc/src/qt6-changes.qdoc index 01602cfca9..024280200a 100644 --- a/src/network/doc/src/qt6-changes.qdoc +++ b/src/network/doc/src/qt6-changes.qdoc @@ -46,7 +46,7 @@ \section2 Ambigous name overloads Several ambigous overloaded functions are removed. The error() signal - is replaced by errorOccured() in QAbstractSocket and its heirs + is replaced by errorOccurred() in QAbstractSocket and its heirs (QTcpSocket, QUdpSocket, QLocalSocket, and QSslSocket), and in QNetworkReply. Code such as: -- cgit v1.2.3