use standard icon for the close tab button in QCommonStyle

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/styles/images/standardbutton-closetab-16.png b/src/gui/styles/images/standardbutton-closetab-16.png
deleted file mode 100644 (file)
index 540694e..0000000
Binary files a/src/gui/styles/images/standardbutton-closetab-16.png and /dev/null differ

diff --git a/src/gui/styles/images/standardbutton-closetab-down-16.png b/src/gui/styles/images/standardbutton-closetab-down-16.png
deleted file mode 100644 (file)
index ccec241..0000000
Binary files a/src/gui/styles/images/standardbutton-closetab-down-16.png and /dev/null differ

diff --git a/src/gui/styles/images/standardbutton-closetab-hover-16.png b/src/gui/styles/images/standardbutton-closetab-hover-16.png
deleted file mode 100644 (file)
index b22a0ff..0000000
Binary files a/src/gui/styles/images/standardbutton-closetab-hover-16.png and /dev/null differ

diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 994bcc7..a8133a8 100644 (file)
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -342,17 +342,8 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
     }
     case PE_IndicatorTabClose: {
         if (d->tabBarcloseButtonIcon.isNull()) {
-            d->tabBarcloseButtonIcon.addPixmap(QPixmap(
-                        QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-closetab-16.png")),
-                        QIcon::Normal, QIcon::Off);
-            d->tabBarcloseButtonIcon.addPixmap(QPixmap(
-                        QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-closetab-down-16.png")),
-                        QIcon::Normal, QIcon::On);
-            d->tabBarcloseButtonIcon.addPixmap(QPixmap(
-                        QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-closetab-hover-16.png")),
-                        QIcon::Active, QIcon::Off);
+            d->tabBarcloseButtonIcon = standardIcon(QStyle::SP_DialogCloseButton, opt, widget);
         }
-
         int size = proxy()->pixelMetric(QStyle::PM_SmallIconSize);
         QIcon::Mode mode = opt->state & State_Enabled ?
                             (opt->state & State_Raised ? QIcon::Active : QIcon::Normal)

diff --git a/src/gui/styles/qstyle.qrc b/src/gui/styles/qstyle.qrc
index 43633f4..3a2ecb9 100644 (file)
--- a/src/gui/styles/qstyle.qrc
+++ b/src/gui/styles/qstyle.qrc
@@ -2,9 +2,6 @@
 <qresource prefix="/trolltech/styles/commonstyle">
 <file>images/fontbitmap-16.png</file>
 <file>images/fonttruetype-16.png</file>
-<file>images/standardbutton-closetab-16.png</file>
-<file>images/standardbutton-closetab-down-16.png</file>
-<file>images/standardbutton-closetab-hover-16.png</file>
 <file>images/tree_branch_open.png</file>
 <file>images/tree_branch_closed.png</file>
 <file>images/tb_extension_arrow_v.png</file>