diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-08-19 11:19:06 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-08-23 14:37:10 +0200 |
| commit | b62171062be100186a71d00610c15a0b07d07c72 (patch) | |
| tree | a8c0be5f3035f734a46721bcc9171224c742d19e /src/multimedia/qmediaobject.h | |
| parent | 0250b243d1d43d904622433bf632b249c21e7323 (diff) | |
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 <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/multimedia/qmediaobject.h')
| -rw-r--r-- | src/multimedia/qmediaobject.h | 4 |
1 files changed, 3 insertions, 1 deletions
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(); |