diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:02:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:02:29 +0100 |
| commit | 6f5bc03ecbf0e8233ae638a54457557c6c32cba2 (patch) | |
| tree | 742032e0cdadb6328c180be35718ecf9dd9b7116 /src/quicktemplates2/qquickpopup.cpp | |
| parent | 3725155f6c5cdfad0e99d232f09c7ae0d0de617f (diff) | |
| parent | 9fdbdea176007ed7b470e317e9002aa77ddd4ead (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ibd3a8a111ce70643199c64f41143f332a34826f8
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 72e4f042..dd7dede6 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -1972,8 +1972,8 @@ void QQuickPopup::setOpacity(qreal opacity) This property holds the scale factor of the popup. The default value is \c 1.0. A scale of less than \c 1.0 causes the popup to be rendered at a smaller size, - and a scale greater than \c 1.0 renders the popup at a larger size. A negative - scale causes the popup to be mirrored when rendered. + and a scale greater than \c 1.0 renders the popup at a larger size. Negative + scales are not supported. */ qreal QQuickPopup::scale() const { |