diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-01 12:05:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-04 11:18:45 +0200 |
| commit | a0cdd6f79222d06a0fc41caa1fbb35acb20d4961 (patch) | |
| tree | 0fe7d559df8fb23c093dc29130bf1a763798b910 /src | |
| parent | 421fa617369646eb99750c52a3b38fc3b3015ec6 (diff) | |
Fix API of QCameraExposure, QCameraFocus, QCameraImageProcessing for Qt for Python
The classes inherit QObject, but make the destructor private, which
makes it impossible to add Qt for Python bindings.
Make destructors protected to fix this. This is arguably a BC break
for compilers which have the accessibility mangled in the symbol, but,
since the destructor was private, there cannot be any code using it.
Task-number: QTBUG-74422
Task-number: PYSIDE-1041
Change-Id: Id23d73aea8aedf15caafa20c048a80efd3e880bd
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/camera/qcameraexposure.h | 4 | ||||
| -rw-r--r-- | src/multimedia/camera/qcamerafocus.h | 4 | ||||
| -rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h index f8eb68fbf..a1dc96701 100644 --- a/src/multimedia/camera/qcameraexposure.h +++ b/src/multimedia/camera/qcameraexposure.h @@ -165,11 +165,13 @@ Q_SIGNALS: void isoSensitivityChanged(int); void exposureCompensationChanged(qreal); +protected: + virtual ~QCameraExposure(); + private: friend class QCamera; friend class QCameraPrivate; explicit QCameraExposure(QCamera *parent = nullptr); - virtual ~QCameraExposure(); Q_DISABLE_COPY(QCameraExposure) Q_DECLARE_PRIVATE(QCameraExposure) diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h index 31d056de9..024f504e9 100644 --- a/src/multimedia/camera/qcamerafocus.h +++ b/src/multimedia/camera/qcamerafocus.h @@ -152,11 +152,13 @@ Q_SIGNALS: void maximumOpticalZoomChanged(qreal); void maximumDigitalZoomChanged(qreal); +protected: + ~QCameraFocus(); + private: friend class QCamera; friend class QCameraPrivate; QCameraFocus(QCamera *camera); - ~QCameraFocus(); Q_DISABLE_COPY(QCameraFocus) Q_DECLARE_PRIVATE(QCameraFocus) diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h index 3eb7c8569..e4ad00ff8 100644 --- a/src/multimedia/camera/qcameraimageprocessing.h +++ b/src/multimedia/camera/qcameraimageprocessing.h @@ -116,11 +116,13 @@ public: void setColorFilter(ColorFilter filter); bool isColorFilterSupported(ColorFilter filter) const; +protected: + ~QCameraImageProcessing(); + private: friend class QCamera; friend class QCameraPrivate; QCameraImageProcessing(QCamera *camera); - ~QCameraImageProcessing(); Q_DISABLE_COPY(QCameraImageProcessing) Q_DECLARE_PRIVATE(QCameraImageProcessing) |