QObjectPrivate: extend the QObjectPrivateVersion to a few more classes
To QtNetwork and QtGui too. This isn't about their loading of QtCore, but about other libraries loading of them. Change-Id: I94ef6a59c321271f939efffdde360657417ae35e Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
parent
3d389ee2ac
commit
3e1dffd5dd
@ -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);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -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 {
|
||||
|
@ -205,8 +205,9 @@ QWindow::~QWindow()
|
||||
d->isWindow = false;
|
||||
}
|
||||
|
||||
QWindowPrivate::QWindowPrivate()
|
||||
= default;
|
||||
QWindowPrivate::QWindowPrivate(decltype(QObjectPrivateVersion) version)
|
||||
: QObjectPrivate(version)
|
||||
{}
|
||||
|
||||
QWindowPrivate::~QWindowPrivate()
|
||||
= default;
|
||||
|
@ -41,7 +41,7 @@ public:
|
||||
WindowFrameExclusive
|
||||
};
|
||||
|
||||
QWindowPrivate();
|
||||
QWindowPrivate(decltype(QObjectPrivateVersion) version = QObjectPrivateVersion);
|
||||
~QWindowPrivate() override;
|
||||
|
||||
void init(QWindow *parent, QScreen *targetScreen = nullptr);
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user