From 3e72a7401b131f9f291d4207dcee37eee7e10a0d Mon Sep 17 00:00:00 2001
From: Alexander Gorishnyak <kefir500@gmail.com>
Date: Fri, 27 Aug 2021 15:58:54 +0600
Subject: [PATCH] Fix inconsistent main icon detection, closes #496

---
 tools/linuxdeployqt/main.cpp | 42 ++++++------------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/tools/linuxdeployqt/main.cpp b/tools/linuxdeployqt/main.cpp
index d7d5f82f..2d023b13 100644
--- a/tools/linuxdeployqt/main.cpp
+++ b/tools/linuxdeployqt/main.cpp
@@ -419,42 +419,12 @@ int main(int argc, char **argv)
         if(candidates.length() == 1){
             iconToBeUsed = candidates.at(0); // The only choice
         } else if(candidates.length() > 1){
-            foreach(QString current, candidates) {
-                if(current.contains("256")){
-                    iconToBeUsed = current;
-                    continue;
-                }
-                if(current.contains("128")){
-                    iconToBeUsed = current;
-                    continue;
-                }
-                if(current.contains("svg")){
-                    iconToBeUsed = current;
-                    continue;
-                }
-                if(current.contains("svgz")){
-                    iconToBeUsed = current;
-                    continue;
-                }
-                if(current.contains("512")){
-                    iconToBeUsed = current;
-                    continue;
-                }
-                if(current.contains("1024")){
-                    iconToBeUsed = current;
-                    continue;
-                }
-                if(current.contains("64")){
-                    iconToBeUsed = current;
-                    continue;
-                }
-                if(current.contains("48")){
-                    iconToBeUsed = current;
-                    continue;
-                }
-                if(current.contains("xpm")){
-                    iconToBeUsed = current;
-                    continue;
+            const QStringList iconPriorities{"256", "128", "svg", "svgz", "512", "1024", "64", "48", "xpm"};
+            foreach (const QString &iconPriority, iconPriorities) {
+                const auto filteredCandidates = candidates.filter(iconPriority);
+                if (!filteredCandidates.isEmpty()) {
+                    iconToBeUsed = filteredCandidates.first();
+                    break;
                 }
             }
         }