diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
| commit | 7d592bcbfb604b1179004e311aa6a972fab6707c (patch) | |
| tree | 92d7ea1e139c3d264dd75dc527c2113e279db9f6 /src/quicktemplates2/qquickspinbox.cpp | |
| parent | f57f2d9e45b177232b76bde07ff96ef3e43fe5b1 (diff) | |
| parent | 44dd55be23138f0a6495b08818acaaa0ff68b086 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickrangeslider.cpp
Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf
Diffstat (limited to 'src/quicktemplates2/qquickspinbox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index d6ad106a..fb77ddee 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -94,7 +94,7 @@ static const int AUTO_REPEAT_INTERVAL = 100; */ /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlsignal QtQuick.Controls::SpinBox::valueModified() This signal is emitted when the spin box value has been interactively @@ -670,7 +670,7 @@ QQuickSpinButton *QQuickSpinBox::down() const } /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlproperty flags QtQuick.Controls::SpinBox::inputMethodHints This property provides hints to the input method about the expected content @@ -697,7 +697,7 @@ void QQuickSpinBox::setInputMethodHints(Qt::InputMethodHints hints) } /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlproperty bool QtQuick.Controls::SpinBox::inputMethodComposing \readonly |