diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index ea8a32d8d57..585a07158ea 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -129,8 +129,12 @@ static void checkWarnMessage(const QIODevice *device, const char *function, cons /*! \internal */ -QIODevicePrivate::QIODevicePrivate() +QIODevicePrivate::QIODevicePrivate(decltype(QObjectPrivateVersion) version) +#ifndef QT_NO_QOBJECT + : QObjectPrivate(version) +#endif { + Q_UNUSED(version); } /*! diff --git a/src/corelib/io/qiodevice_p.h b/src/corelib/io/qiodevice_p.h index 9f45e828312..151548fb04e 100644 --- a/src/corelib/io/qiodevice_p.h +++ b/src/corelib/io/qiodevice_p.h @@ -23,6 +23,8 @@ #include "private/qringbuffer_p.h" #ifndef QT_NO_QOBJECT #include "private/qobject_p.h" +#else +static constexpr int QObjectPrivateVersion = QT_VERSION; #endif QT_BEGIN_NAMESPACE @@ -42,7 +44,7 @@ class Q_CORE_EXPORT QIODevicePrivate Q_DISABLE_COPY_MOVE(QIODevicePrivate) public: - QIODevicePrivate(); + QIODevicePrivate(decltype(QObjectPrivateVersion) version = QObjectPrivateVersion); virtual ~QIODevicePrivate(); enum class ReadLineOption { diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 50f495158e6..072389e8598 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -205,8 +205,9 @@ QWindow::~QWindow() d->isWindow = false; } -QWindowPrivate::QWindowPrivate() - = default; +QWindowPrivate::QWindowPrivate(decltype(QObjectPrivateVersion) version) + : QObjectPrivate(version) +{} QWindowPrivate::~QWindowPrivate() = default; diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 0d513285173..3f57e6be11e 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -41,7 +41,7 @@ public: WindowFrameExclusive }; - QWindowPrivate(); + QWindowPrivate(decltype(QObjectPrivateVersion) version = QObjectPrivateVersion); ~QWindowPrivate() override; void init(QWindow *parent, QScreen *targetScreen = nullptr); diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 9976a9c1260..7d871d57584 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -493,7 +493,8 @@ static bool isProxyError(QAbstractSocket::SocketError error) Constructs a QAbstractSocketPrivate. Initializes all members. */ -QAbstractSocketPrivate::QAbstractSocketPrivate() +QAbstractSocketPrivate::QAbstractSocketPrivate(decltype(QObjectPrivateVersion) version) + : QIODevicePrivate(version) { writeBufferChunkSize = QABSTRACTSOCKET_BUFFERSIZE; } diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index cc5f53179c0..80467a724e0 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -32,7 +32,7 @@ class QAbstractSocketPrivate : public QIODevicePrivate, public QAbstractSocketEn { Q_DECLARE_PUBLIC(QAbstractSocket) public: - QAbstractSocketPrivate(); + QAbstractSocketPrivate(decltype(QObjectPrivateVersion) version = QObjectPrivateVersion); virtual ~QAbstractSocketPrivate(); // from QAbstractSocketEngineReceiver