From f21e89e4ee6077e0ddcfeb6f4791cb4389f0ba5c Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 29 Apr 2016 13:04:39 +0200 Subject: Mark CameraImageProcessing's new brightness property with revision 2 It was added in Qt 5.7 and the QML version should be adjusted accordingly. Change-Id: I227a63c240edbe8880612076899dc3db47dc47d0 Reviewed-by: Yoann Lopes --- src/imports/multimedia/multimedia.cpp | 2 ++ src/imports/multimedia/qdeclarativecameraimageprocessing_p.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/imports') diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index ae00e4413..872b2ae61 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -137,6 +137,8 @@ public: // 5.7 types qmlRegisterType(uri, 5, 7, "Playlist"); + qmlRegisterUncreatableType(uri, 5, 7, "CameraImageProcessing", + trUtf8("CameraImageProcessing is provided by Camera")); qmlRegisterType(); qmlRegisterType(); diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h index bb10cdeba..eb755d87c 100644 --- a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h +++ b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h @@ -66,7 +66,7 @@ class QDeclarativeCameraImageProcessing : public QObject Q_PROPERTY(WhiteBalanceMode whiteBalanceMode READ whiteBalanceMode WRITE setWhiteBalanceMode NOTIFY whiteBalanceModeChanged) Q_PROPERTY(qreal manualWhiteBalance READ manualWhiteBalance WRITE setManualWhiteBalance NOTIFY manualWhiteBalanceChanged) - Q_PROPERTY(qreal brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged) + Q_PROPERTY(qreal brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged REVISION 2) Q_PROPERTY(qreal contrast READ contrast WRITE setContrast NOTIFY contrastChanged) Q_PROPERTY(qreal saturation READ saturation WRITE setSaturation NOTIFY saturationChanged) Q_PROPERTY(qreal sharpeningLevel READ sharpeningLevel WRITE setSharpeningLevel NOTIFY sharpeningLevelChanged) @@ -116,7 +116,7 @@ public Q_SLOTS: void setWhiteBalanceMode(QDeclarativeCameraImageProcessing::WhiteBalanceMode mode) const; void setManualWhiteBalance(qreal colorTemp) const; - void setBrightness(qreal value); + Q_REVISION(2) void setBrightness(qreal value); void setContrast(qreal value); void setSaturation(qreal value); void setSharpeningLevel(qreal value); @@ -128,7 +128,7 @@ Q_SIGNALS: void whiteBalanceModeChanged(QDeclarativeCameraImageProcessing::WhiteBalanceMode) const; void manualWhiteBalanceChanged(qreal) const; - void brightnessChanged(qreal); + Q_REVISION(2) void brightnessChanged(qreal); void contrastChanged(qreal); void saturationChanged(qreal); void sharpeningLevelChanged(qreal); -- cgit v1.2.3