X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=icons%2Fimport%2Fimport_theme.pl;fp=icons%2Fimport%2Fimport_theme.pl;h=42f60bb993787c476025f2087cbe4041eda51c2a;hp=6ac923b93e8dea03d3162f71f755ce2e6dac3f4b;hb=b7447afe8e836376776dac26704e227a678d2913;hpb=d9a837786c9661ba733d1601ddbf7c83801233af

diff --git a/icons/import/import_theme.pl b/icons/import/import_theme.pl
index 6ac923b9..42f60bb9 100755
--- a/icons/import/import_theme.pl
+++ b/icons/import/import_theme.pl
@@ -62,13 +62,14 @@ while(<BLACKLIST>) {
 }
 close BLACKLIST;
 
-# We now grep the source for QIcon::fromTheme("fubar") to find required icons
+# We now grep the source for icon::get() to find required icons
 print "Grepping $srcdir for required icons...\n";
-my @results = `grep -r QIcon::fromTheme\\(\\" $srcdir`;
+my @results = `grep -r icon::get $srcdir`;
 foreach(@results) {
-  next unless my ($name) = /\W+QIcon::fromTheme\(\"([-\w]+)/;
-  $req_icons{$name} = 1
-    unless exists $blacklist{$name};
+  next unless my (@names) = /\W+icon::get\((?:\"([-\w]+)\")|(?:\{\s*\"([-\w]+)\"(?:,\s*\"([-\w]+)\")*\s*\})/;
+  foreach(@names) {
+    $req_icons{$_} = 1 unless not defined or exists $blacklist{$_};
+  }
 }
 
 # Clean old output dir