From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 8 Feb 2015 17:07:30 +0000 (+0100)
Subject: Add missing index.theme to the bundled Oxygen icon theme
X-Git-Tag: 0.12-beta1~23
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=2ac71ab56f56ceeebe572f7e656b9ea7dd1c88d5

Add missing index.theme to the bundled Oxygen icon theme

Otherwise, the icon loader may not find the bundled icons.
---

diff --git a/icons/import/import_oxygen.pl b/icons/import/import_oxygen.pl
index c6132d01..c6fb8177 100755
--- a/icons/import/import_oxygen.pl
+++ b/icons/import/import_oxygen.pl
@@ -72,8 +72,6 @@ foreach my $sizestr (readdir BASEDIR) {
   opendir (SIZEDIR, "$oxygen/$sizestr") or die "Could not open dir $sizestr\n";
   foreach my $cat (readdir SIZEDIR) {
     next if $cat eq '.' or $cat eq '..';
-    #system "mkdir -p $output/$sizestr/$cat" and die "Could not create category dir\n";
-    system "mkdir -p $output/scalable/$cat" and die "Could not create category dir\n";
     opendir (CATDIR, "$oxygen/$sizestr/$cat") or die "Could not open category dir\n";
     foreach my $icon (readdir CATDIR) {
       $icon =~ s/\.png$//;
@@ -105,13 +103,13 @@ foreach my $icon (keys %req_icons) {
   print "Warning: Missing icon $icon\n";
 }
 
+# Copy license etc.
+system "cp $oxygen/AUTHORS $oxygen/CONTRIBUTING $oxygen/COPYING $oxygen/index.theme $output/";
+
 # Generate .qrc
 my @file_list;
 generate_qrc($output, $qrcfile_kde);
 
-# Copy license etc.
-system "cp $oxygen/AUTHORS $oxygen/CONTRIBUTING $oxygen/COPYING $oxygen/index.theme $output/";
-
 print "Done.\n";
 
 ########################################################################################
@@ -135,7 +133,7 @@ sub generate_qrc {
 }
 
 sub push_icon_path {
-  return unless /\.png$/;
+  return unless /\.png$/ or /^index.theme$/;
 
   push @file_list, "    <file>$File::Find::name</file>";
 }
diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc
index 3b019426..b451269f 100644
--- a/icons/oxygen.qrc
+++ b/icons/oxygen.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/icons">
+    <file>oxygen/index.theme</file>
     <file>oxygen/22x22/actions/irc-voice.png</file>
     <file>oxygen/22x22/actions/go-next.png</file>
     <file>oxygen/22x22/actions/im-user.png</file>