diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 11:51:27 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-09-04 13:16:02 +0300 |
| commit | b2a5fc61ad374503ace4c96c68fbfc5a6670b8fa (patch) | |
| tree | 8e0470f057143e5a1c36791d83b42af9729b1745 /src/multimedia/qmediaserviceproviderplugin.h | |
| parent | dd56d0fd8b45566c491ef30624177919eee621b4 (diff) | |
| parent | adfea3dee38c03df8cb68eaefb77907902d910ca (diff) | |
Merge "Merge dev into 5.14 (delayed final downmerge)"
Diffstat (limited to 'src/multimedia/qmediaserviceproviderplugin.h')
| -rw-r--r-- | src/multimedia/qmediaserviceproviderplugin.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 6447e319a..9afb4f4cd 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -50,6 +50,8 @@ # pragma Q_MOC_EXPAND_MACROS #endif +#if QT_DEPRECATED_SINCE(5, 14) + QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -252,4 +254,5 @@ public: QT_END_NAMESPACE +#endif // #if QT_DEPRECATED_SINCE(5, 14) #endif // QMEDIASERVICEPROVIDERPLUGIN_H |