From b62171062be100186a71d00610c15a0b07d07c72 Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Mon, 19 Aug 2019 11:19:06 +0200 Subject: Make QMediaObjectPrivate as QObjectPrivate Since QMediaObject is QObject, and it uses d_ptr, it is sane to move QMediaObjectPrivate to QObjectPrivate and use standard way of using private impl. NOTE : If some users inherit from QMediaObjectPrivate in their code, they probably initialize and delete d_ptr manually which would cause a crash now. But using QMediaObjectPrivate without QMediaObject should be considered as incorrect usage. Task-number: QTBUG-77630 Change-Id: I147e3b3dc67a8c2765b28f752db196b4d7fca224 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/multimedia/qmediaobject.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/multimedia/qmediaobject.h') diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index 5788254b8..fabd015fe 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -93,7 +93,9 @@ protected: void addPropertyWatch(QByteArray const &name); void removePropertyWatch(QByteArray const &name); - QMediaObjectPrivate *d_ptr; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QMediaObjectPrivate *d_ptr_deprecated; +#endif private: void setupControls(); -- cgit v1.2.3