summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-03-20 13:31:47 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-03-20 14:00:30 +0100
commit54194b5a5054aa1be6e1dbbbaad00968f8848d75 (patch)
tree92ccba733d07dfdde60c5b87b172822957080313
parent9327d65dc5eccff475bcda8a9f114e9862122d93 (diff)
downloadkube-54194b5a5054aa1be6e1dbbbaad00968f8848d75.tar.gz
kube-54194b5a5054aa1be6e1dbbbaad00968f8848d75.zip
Don't overwrite the original icon search paths
-rw-r--r--applications/kube/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/applications/kube/main.cpp b/applications/kube/main.cpp
index 61521af5..ef88500e 100644
--- a/applications/kube/main.cpp
+++ b/applications/kube/main.cpp
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
160 app.setApplicationVersion(kube_VERSION_STRING); 160 app.setApplicationVersion(kube_VERSION_STRING);
161 app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal}); 161 app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal});
162 162
163 //On Mac OS we want to incluee Contents/Resources/icons in the bundle, and that path is in AppDataLocations. 163 //On Mac OS we want to include Contents/Resources/icons in the bundle, and that path is in AppDataLocations.
164 QStringList iconSearchPaths; 164 QStringList iconSearchPaths;
165 for (const auto &p : QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) { 165 for (const auto &p : QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {
166 auto iconPath = p + "/icons/"; 166 auto iconPath = p + "/icons/";
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
170 } 170 }
171 iconSearchPaths << iconPath; 171 iconSearchPaths << iconPath;
172 } 172 }
173 QIcon::setThemeSearchPaths(iconSearchPaths); 173 QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() + iconSearchPaths);
174 174
175 QCommandLineParser parser; 175 QCommandLineParser parser;
176 parser.setApplicationDescription("A communication and collaboration client."); 176 parser.setApplicationDescription("A communication and collaboration client.");