Merge remote-tracking branch 'origin/5.9' into 5.10

Conflicts:
	src/quicktemplates2/qquickabstractbutton_p.h
	src/quicktemplates2/qquickbuttongroup_p.h
	src/quicktemplates2/qquickrangeslider.cpp
	src/quicktemplates2/qquickrangeslider_p.h
	src/quicktemplates2/qquickswipeview_p.h
	src/quicktemplates2/qquicktextarea.cpp
	src/quicktemplates2/qquicktextarea_p.h
	src/quicktemplates2/qquicktextfield_p.h

Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0

1 files changed, 3 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquicktabbar_p.h b/src/quicktemplates2/qquicktabbar_p.h
index 0e4a3c58..f0299bd5 100644
--- a/src/quicktemplates2/qquicktabbar_p.h
+++ b/src/quicktemplates2/qquicktabbar_p.h
@@ -60,6 +60,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabBar : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
+    // 2.2 (Qt 5.9)
     Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL REVISION 2)
     Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight RESET resetContentHeight NOTIFY contentHeightChanged FINAL REVISION 2)
 
@@ -75,6 +76,7 @@ public:
     Position position() const;
     void setPosition(Position position);
 
+    // 2.2 (Qt 5.9)
     qreal contentWidth() const;
     void setContentWidth(qreal width);
     void resetContentWidth();
@@ -87,6 +89,7 @@ public:
 
 Q_SIGNALS:
     void positionChanged();
+    // 2.2 (Qt 5.9)
     Q_REVISION(2) void contentWidthChanged();
     Q_REVISION(2) void contentHeightChanged();