Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/winrt/qwinrtcameracontrol.cpp

Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4

1 files changed, 5 insertions, 5 deletions

diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
index ae0db05f0..b50ed2ff5 100644
--- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
+++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
@@ -85,8 +85,8 @@ private:
 class QDeclarativeAttenuationModelLinear : public QDeclarativeAttenuationModel
 {
     Q_OBJECT
-    Q_PROPERTY(qreal start READ startDistance WRITE setStartDistance CONSTANT)
-    Q_PROPERTY(qreal end READ endDistance WRITE setEndDistance CONSTANT)
+    Q_PROPERTY(qreal start READ startDistance WRITE setStartDistance)
+    Q_PROPERTY(qreal end READ endDistance WRITE setEndDistance)
 
 public:
     QDeclarativeAttenuationModelLinear(QObject *parent = 0);
@@ -110,9 +110,9 @@ private:
 class QDeclarativeAttenuationModelInverse : public QDeclarativeAttenuationModel
 {
     Q_OBJECT
-    Q_PROPERTY(qreal start READ referenceDistance WRITE setReferenceDistance CONSTANT)
-    Q_PROPERTY(qreal end READ maxDistance WRITE setMaxDistance CONSTANT)
-    Q_PROPERTY(qreal rolloff READ rolloffFactor WRITE setRolloffFactor CONSTANT)
+    Q_PROPERTY(qreal start READ referenceDistance WRITE setReferenceDistance)
+    Q_PROPERTY(qreal end READ maxDistance WRITE setMaxDistance)
+    Q_PROPERTY(qreal rolloff READ rolloffFactor WRITE setRolloffFactor)
 
 public:
     QDeclarativeAttenuationModelInverse(QObject *parent = 0);