diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-19 13:25:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-19 16:12:34 +0200 |
| commit | ce09ef431373f45d14ce0a6e7de24aee3666093d (patch) | |
| tree | 7c998b21f02db55e233e7eeb1599663f1c6b51ca /src/widgets/widgets | |
| parent | 7ad55ca65f42351e231f31f7a9253ae6eaf1ebb3 (diff) | |
| parent | 97eec16e4ff6367c233f8ea6c4a343c286c3a514 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/windows/qwindowscontext.cpp
src/plugins/platforms/windows/windows.pri
src/tools/uic/cpp/cppwriteinitialization.cpp
src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qplaintextedit.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qpushbutton.cpp | 3 | ||||
| -rw-r--r-- | src/widgets/widgets/qsizegrip.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 7e01f6f3d5..746dc20122 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -1978,7 +1978,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e) } - if (!placeholderText().isEmpty() && document()->isEmpty()) { + if (!placeholderText().isEmpty() && document()->isEmpty() && layout->preeditAreaText().isEmpty()) { Q_D(QPlainTextEdit); QColor col = d->control->palette().text().color(); col.setAlpha(128); diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp index 57af09fef5..e13ea83fd7 100644 --- a/src/widgets/widgets/qpushbutton.cpp +++ b/src/widgets/widgets/qpushbutton.cpp @@ -513,7 +513,8 @@ void QPushButton::focusOutEvent(QFocusEvent *e) Ownership of the menu is \e not transferred to the push button. \image fusion-pushbutton-menu.png Screenshot of a Fusion style push button with popup menu. - A push button with popup menus shown in the \l{Fusion Style Widget Gallery}{Fusion widget style}. + A push button with popup menus shown in the \l{Qt Widget Gallery} + {Fusion widget style}. \sa menu() */ diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp index 82857c8805..f0ede5f2ff 100644 --- a/src/widgets/widgets/qsizegrip.cpp +++ b/src/widgets/widgets/qsizegrip.cpp @@ -197,7 +197,7 @@ Qt::Corner QSizeGripPrivate::corner() const \table 50% \row \li \inlineimage fusion-statusbar-sizegrip.png Screenshot of a Fusion style size grip \li A size grip widget at the bottom-right corner of a main window, shown in the - \l{Fusion Style Widget Gallery}{Fusion widget style}. + \l{Qt Widget Gallery}{Fusion widget style}. \endtable The QSizeGrip class inherits QWidget and reimplements the \l diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index d2bd7285ca..060d1f9a03 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -302,7 +302,7 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const \table 100% \row \li \inlineimage fusion-tabbar.png Screenshot of a Fusion style tab bar - \li A tab bar shown in the Fusion widget style. + \li A tab bar shown in the \l{Qt Widget Gallery}{Fusion widget style}. \row \li \inlineimage fusion-tabbar-truncated.png Screenshot of a truncated Fusion tab bar \li A truncated tab bar shown in the Fusion widget style. \endtable |