TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix inconsistent main icon detection, closes #496 (#498)

Browse Source 
Co-authored-by: probonopd <probonopd@users.noreply.github.com>
This commit is contained in:
Alexander Gorishnyak
2022-12-16 00:04:26 +06:00
committed by GitHub
parent 5fa79fa1df
commit deebf70ea6
1 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/main.cpp
+6 -36
View File
@@ -425,42 +425,12 @@ int main(int argc, char **argv)
if(candidates.length() == 1){ if(candidates.length() == 1){
iconToBeUsed = candidates.at(0); // The only choice iconToBeUsed = candidates.at(0); // The only choice
} else if(candidates.length() > 1){ } else if(candidates.length() > 1){
foreach(QString current, candidates) { const QStringList iconPriorities{"256", "128", "svg", "svgz", "512", "1024", "64", "48", "xpm"};
if(current.contains("256")){ foreach (const QString &iconPriority, iconPriorities) {
iconToBeUsed = current; const auto filteredCandidates = candidates.filter(iconPriority);
continue; if (!filteredCandidates.isEmpty()) {
} iconToBeUsed = filteredCandidates.first();
if(current.contains("128")){ break;
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;
} }
} }
} }