Get rid of QtSVG dependency

This commit is contained in:
Christophe Dumez
2011-03-26 09:03:12 +00:00
parent a24dc147ab
commit 93a84655b6
8 changed files with 6 additions and 53 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -21,6 +21,7 @@
<file>Icons/skin/slider-area.gif</file>
<file>Icons/skin/stalledDL.png</file>
<file>Icons/skin/error.png</file>
<file>Icons/skin/qbittorrent_mono_dark.png</file>
<file>Icons/skin/handle-icon-horizontal.gif</file>
<file>Icons/skin/qbittorrent32.png</file>
<file>Icons/skin/knob.gif</file>
@@ -34,7 +35,6 @@
<file>Icons/skin/firewalled.png</file>
<file>Icons/skin/downloading.png</file>
<file>Icons/skin/toolbox-divider.gif</file>
<file>Icons/skin/qbittorrent_mono.svg</file>
<file>Icons/skin/stalledUP.png</file>
<file>Icons/skin/filteractive.png</file>
<file>Icons/skin/bg-handle-horizontal.gif</file>

View File

@@ -1349,9 +1349,9 @@ void MainWindow::checkForActiveTorrents()
QIcon MainWindow::getSystrayIcon() const
{
#if defined(Q_WS_X11) && defined(QT_SVG_LIB)
#if defined(Q_WS_X11)
if(Preferences().useMonochromeTrayIcon()) {
return QIcon(":/Icons/skin/qbittorrent_mono.svg");
return QIcon(":/Icons/skin/qbittorrent_mono_dark.png");
}
#endif
QIcon icon;

View File

@@ -106,7 +106,7 @@ options_imp::options_imp(QWidget *parent):
checkShowSystray->setChecked(false);
checkShowSystray->setEnabled(false);
}
#if !defined(Q_WS_X11) || !defined(QT_SVG_LIB)
#if !defined(Q_WS_X11)
checkUseMonoSystrayIcon->setVisible(false);
#endif
// Connect signals / slots

View File

@@ -71,7 +71,7 @@ for root, dirs, files in os.walk('Icons'):
if 'skin_unused' in dirs:
dirs.remove('skin_unused')
for file in files:
if splitext(file)[-1] in ('.png', '.jpg', '.gif', '.svg'):
if splitext(file)[-1] in ('.png', '.jpg', '.gif'):
icons_list.append(join(root, file))
output = '''<!DOCTYPE RCC><RCC version="1.0">