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