diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
| commit | 7344987c20d13710af89300f9b39e06397ec592a (patch) | |
| tree | 4c12e46adefd3aee9d2ce479923fe56bab483764 /src/widgets/widgets/qplaintextedit.cpp | |
| parent | 8ad5967793f43bda2c38e3f9dddd3d2b6fef5390 (diff) | |
| parent | 29208fa07c1b9f656ea2535696828385b7832226 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad
Diffstat (limited to 'src/widgets/widgets/qplaintextedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qplaintextedit.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 63db93d43f..e54b28a045 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -2338,8 +2338,6 @@ void QPlainTextEdit::wheelEvent(QWheelEvent *e) #endif /*! - \fn QPlainTextEdit::zoomIn(int range) - Zooms in on the text by making the base font size \a range points larger and recalculating all font sizes to be the new size. This does not change the size of any images. @@ -2352,10 +2350,6 @@ void QPlainTextEdit::zoomIn(int range) } /*! - \fn QPlainTextEdit::zoomOut(int range) - - \overload - Zooms out on the text by making the base font size \a range points smaller and recalculating all font sizes to be the new size. This does not change the size of any images. |