1 files changed, 28 insertions, 4 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 936eb76dad..f5b61ea6f3 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -65,6 +65,7 @@
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qrubberband.h>
+#include "qtreeview.h"
 #include <private/qcommonstylepixmaps_p.h>
 #include <private/qmath_p.h>
 #include <qdebug.h>
@@ -5097,11 +5098,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
             ret = theme->themeHint(QPlatformTheme::ToolButtonStyle).toInt();
         break;
     case SH_RequestSoftwareInputPanel:
-#ifdef Q_OS_ANDROID
         ret = RSIP_OnMouseClick;
-#else
-        ret = RSIP_OnMouseClickAndAlreadyFocused;
-#endif
         break;
     case SH_ScrollBar_Transient:
         ret = false;
@@ -5109,6 +5106,24 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
     case SH_Menu_SupportsSections:
         ret = false;
         break;
+#ifndef QT_NO_TOOLTIP
+    case SH_ToolTip_WakeUpDelay:
+        ret = 700;
+        break;
+    case SH_ToolTip_FallAsleepDelay:
+        ret = 2000;
+        break;
+#endif
+    case SH_Widget_Animate:
+#ifndef QT_NO_TREEVIEW
+        if (qobject_cast<const QTreeView*>(widget)) {
+            ret = false;
+        } else
+#endif
+            {
+            ret = true;
+        }
+        break;
     default:
         ret = 0;
         break;
@@ -5289,6 +5304,13 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
                     }
                 }
                 break;
+        case SP_LineEditClearButton: {
+            QString themeName = rtl ? QStringLiteral("edit-clear-locationbar-ltr") : QStringLiteral("edit-clear-locationbar-rtl");
+            if (!QIcon::hasThemeIcon(themeName))
+                themeName = QStringLiteral("edit-clear");
+            pixmap = QIcon::fromTheme(themeName).pixmap(16);
+        }
+            break;
         default:
             break;
         }
@@ -5417,6 +5439,8 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
         return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-16.png"));
     case SP_MediaVolumeMuted:
         return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-muted-16.png"));
+    case SP_LineEditClearButton:
+        return QPixmap(QStringLiteral(":/qt-project.org/styles/commonstyle/images/cleartext-16.png"));
 #endif // QT_NO_IMAGEFORMAT_PNG
     default:
         break;