From 0e9ea64edcdb451ffcfbf055174354e6c8f2df88 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 8 Apr 2013 10:08:19 +0200
Subject: [PATCH] Add Style hint for Clear buttons within QLineEdit.

Initial-patch-by: Kevin.Ottens@kdab.com

Change-Id: I4893923d5015535eb6d934636d6b5925088d7be8
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
---
 src/widgets/styles/images/cleartext-16.png | Bin 0 -> 760 bytes
 src/widgets/styles/qcommonstyle.cpp        |   9 +++++++++
 src/widgets/styles/qstyle.cpp              |   1 +
 src/widgets/styles/qstyle.h                |   1 +
 src/widgets/styles/qstyle.qrc              |   1 +
 5 files changed, 12 insertions(+)
 create mode 100644 src/widgets/styles/images/cleartext-16.png

diff --git a/src/widgets/styles/images/cleartext-16.png b/src/widgets/styles/images/cleartext-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..74133bafffc9dc28c4b0b3cea112dc0ff70b01a8
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igM?
z4jwb3&I9fM00MYPL_t(I%dL~YY9m(^hd<qW=Z;3Y68?i>5E=|gVK5SETrOT?aHql#
zpw7h>f)vJ&u!Y#d;B@;Mjvhc3u7VdAHXGzd9wf$~W+6njHJUp&O)N;lR>=<z91g$p
zap0T-|51g17It=a_LNd>A;f_Yq6v`a`CXppgDlJXqtWQ*yMRWc@j+|-ljnK6p64Ni
z;4c8n<&x!c`87?`pYQMQKfm?Jx1`x@ekhenpNui}YPE_n24f7RQVHMp@qHgD<rc8N
zv9a-OHk*A}0UC|QUb$TERjbu{rBdPe_?YMCXOvPDi$yj!H#s~!B#vW*5WaKnhxPUK
zUuUyfq5yo~Z<k7?-Ez51yWQsG<b)(iI6prJ;PmvATCIk2j()$7wRShlvNmw@1~>?U
z0IfB{;gF-FBeu7<IXgQ8APhs|IA%B;qO~Rn0v3zK0e}GTJg@0_9-ikhpU>%byG$k%
z!Z0KZLnf06-ENope9oKC^Sma20+3R!!Wcsk1pnIi+S(dYN}O{m?`i_)++CjMSZguH
z(ChVxqKG(-iQ||kis<!v7-O*3lIJ<jxw{p>T05}TlBOxGR*QPQ&Uieg)9KLZbQq7v
z)a!LxtrlsTVy(qmJ6Nr;R;&G?lzLYv6t-?}Z+Uup;^N{0Ap}wi`u#phl5lx>iIkEw
zO~1apynLEYr-=lZPNzu}MOFy0FNE+%qY+9eDwPVwVv#J%czAd~YmIa6_t)3gkJs1N
zzx?eIA0HpTL{aojDfOe)dP{4)I%O#(N-2Qf7K_El!C>(DyU(=${{5b>bz4e#K%vkq
q04{fTS)L7+>9T)yb#=r4sXqbVI`}h>_`S0L0000<MNUMnLSTZH!C+JX

literal 0
HcmV?d00001

diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index c6edbee67d..e601110c3e 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -5289,6 +5289,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 +5424,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;
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 603d0e50a5..7ab5734eed 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -1986,6 +1986,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \value SP_MediaSeekBackward Icon indicating that media should seek backward.
     \value SP_MediaVolume Icon indicating a volume control.
     \value SP_MediaVolumeMuted Icon indicating a muted volume control.
+    \value SP_LineEditClearButton Icon for a standard clear button in a QLineEdit. This enum value was added in Qt 5.2.
     \value SP_CustomBase  Base value for custom standard pixmaps;
     custom values must be greater than this value.
 
diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h
index beafad326e..31ec2cd97a 100644
--- a/src/widgets/styles/qstyle.h
+++ b/src/widgets/styles/qstyle.h
@@ -777,6 +777,7 @@ public:
         SP_MediaSeekBackward,
         SP_MediaVolume,
         SP_MediaVolumeMuted,
+        SP_LineEditClearButton,
         // do not add any values below/greater than this
         SP_CustomBase = 0xf0000000
     };
diff --git a/src/widgets/styles/qstyle.qrc b/src/widgets/styles/qstyle.qrc
index 28ad484032..c063ec5036 100644
--- a/src/widgets/styles/qstyle.qrc
+++ b/src/widgets/styles/qstyle.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/qt-project.org/styles/commonstyle">
+        <file>images/cleartext-16.png</file>
         <file>images/filelink-16.png</file>
         <file>images/filelink-32.png</file>
         <file>images/filelink-128.png</file>