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

Conflicts:
	src/quicktemplates2/qquickrangeslider.cpp

Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf

1 files changed, 10 insertions, 10 deletions

diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index f511045a..7ba68f81 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -161,7 +161,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlsignal void QtQuick.Controls::ComboBox::accepted()
 
     This signal is emitted when the \uicontrol Return or \uicontrol Enter key is pressed
@@ -781,7 +781,7 @@ QQmlInstanceModel *QQuickComboBox::delegateModel() const
 }
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlproperty bool QtQuick.Controls::ComboBox::editable
 
     This property holds whether the combo box is editable.
@@ -830,7 +830,7 @@ void QQuickComboBox::setEditable(bool editable)
 }
 
 /*!
-    \since QtQuick.Controls 2.1
+    \since QtQuick.Controls 2.1 (Qt 5.8)
     \qmlproperty bool QtQuick.Controls::ComboBox::flat
 
     This property holds whether the combo box button is flat.
@@ -860,7 +860,7 @@ void QQuickComboBox::setFlat(bool flat)
 }
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlproperty bool QtQuick.Controls::ComboBox::down
 
     This property holds whether the combo box button is visually down.
@@ -1028,7 +1028,7 @@ void QQuickComboBox::resetDisplayText()
 }
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlproperty string QtQuick.Controls::ComboBox::editText
 
     This property holds the text in the text field of an editable combo box.
@@ -1197,7 +1197,7 @@ void QQuickComboBox::setPopup(QQuickPopup *popup)
 }
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlproperty Validator QtQuick.Controls::ComboBox::validator
 
     This property holds an input text validator for an editable combo box.
@@ -1246,7 +1246,7 @@ void QQuickComboBox::setValidator(QValidator *validator)
 }
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlproperty flags QtQuick.Controls::ComboBox::inputMethodHints
 
     Provides hints to the input method about the expected content of the combo box and how it
@@ -1273,7 +1273,7 @@ void QQuickComboBox::setInputMethodHints(Qt::InputMethodHints hints)
 }
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlproperty bool QtQuick.Controls::ComboBox::inputMethodComposing
     \readonly
 
@@ -1290,7 +1290,7 @@ bool QQuickComboBox::isInputMethodComposing() const
 }
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlproperty bool QtQuick.Controls::ComboBox::acceptableInput
     \readonly
 
@@ -1385,7 +1385,7 @@ void QQuickComboBox::decrementCurrentIndex()
 }
 
 /*!
-    \since QtQuick.Controls 2.2
+    \since QtQuick.Controls 2.2 (Qt 5.9)
     \qmlmethod void QtQuick.Controls::ComboBox::selectAll()
 
     Selects all the text in the editable text field of the combo box.