use icons from the system icon theme in QFontComboBox

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

diff --git a/src/gui/styles/images/fontbitmap-16.png b/src/gui/styles/images/fontbitmap-16.png
deleted file mode 100644 (file)
index 6a5ca96..0000000
Binary files a/src/gui/styles/images/fontbitmap-16.png and /dev/null differ

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

diff --git a/src/gui/styles/qstyle.qrc b/src/gui/styles/qstyle.qrc
index 3a2ecb9..91fa48b 100644 (file)
--- a/src/gui/styles/qstyle.qrc
+++ b/src/gui/styles/qstyle.qrc
@@ -1,7 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/trolltech/styles/commonstyle">
-<file>images/fontbitmap-16.png</file>
-<file>images/fonttruetype-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>

diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp
index 7d959cb..1f4418a 100644 (file)
--- a/src/gui/widgets/qfontcombobox.cpp
+++ b/src/gui/widgets/qfontcombobox.cpp
@@ -55,8 +55,8 @@ public:
 QFontFamilyDelegate::QFontFamilyDelegate(QObject *parent)
     : QAbstractItemDelegate(parent)
 {
-    truetype = QIcon(QLatin1String(":/trolltech/styles/commonstyle/images/fonttruetype-16.png"));
-    bitmap = QIcon(QLatin1String(":/trolltech/styles/commonstyle/images/fontbitmap-16.png"));
+    truetype = QIcon::fromTheme(QLatin1String("application-x-font-ttf"));
+    bitmap = QIcon::fromTheme(QLatin1String("application-x-font-bdf"));
 }
 
 void QFontFamilyDelegate::paint(QPainter *painter,