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/qquickpopup.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/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 23d3ad2c..735038b4 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -953,7 +953,7 @@ qreal QQuickPopup::availableHeight() const } /*! - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) \qmlproperty real QtQuick.Controls::Popup::spacing This property holds the spacing. |