diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-05-09 14:21:11 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-05-09 14:21:11 +0200 |
commit | 7cbea07358b608231067a43172bd4f5ea583b2c9 (patch) | |
tree | bc4b091f48c4138aeb6d6ada9779b2fa621b20dd /applications | |
parent | 2745f25a49f7120a58c788101eb4651390f90739 (diff) | |
download | kube-7cbea07358b608231067a43172bd4f5ea583b2c9.tar.gz kube-7cbea07358b608231067a43172bd4f5ea583b2c9.zip |
Windows search paths
Diffstat (limited to 'applications')
-rw-r--r-- | applications/kube/main.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/applications/kube/main.cpp b/applications/kube/main.cpp index a81a0b4d..cbda7630 100644 --- a/applications/kube/main.cpp +++ b/applications/kube/main.cpp | |||
@@ -169,7 +169,11 @@ int main(int argc, char *argv[]) | |||
169 | app.setApplicationVersion(kube_VERSION_STRING); | 169 | app.setApplicationVersion(kube_VERSION_STRING); |
170 | app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal}); | 170 | app.setFont(QFont{"Noto Sans", app.font().pointSize(), QFont::Normal}); |
171 | 171 | ||
172 | const QString kubeIcons = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("kube-icons.rcc")); | 172 | QString kubeIcons = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("kube-icons.rcc")); |
173 | //For windows | ||
174 | if (kubeIcons.isEmpty()) { | ||
175 | kubeIcons = findFile(QStringLiteral("kube/kube-icons.rcc"), QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)); | ||
176 | } | ||
173 | if (!QResource::registerResource(kubeIcons, "/icons/kube")) { | 177 | if (!QResource::registerResource(kubeIcons, "/icons/kube")) { |
174 | qWarning() << "Failed to register icon resource!" << kubeIcons; | 178 | qWarning() << "Failed to register icon resource!" << kubeIcons; |
175 | qWarning() << "Searched paths: " << QStandardPaths::standardLocations(QStandardPaths::AppDataLocation); | 179 | qWarning() << "Searched paths: " << QStandardPaths::standardLocations(QStandardPaths::AppDataLocation); |
@@ -224,6 +228,8 @@ int main(int argc, char *argv[]) | |||
224 | } | 228 | } |
225 | 229 | ||
226 | QQmlApplicationEngine engine; | 230 | QQmlApplicationEngine engine; |
231 | //For windows | ||
232 | engine.addImportPath(QCoreApplication::applicationDirPath() + QStringLiteral("/../qml")); | ||
227 | const auto file = "/org/kube/components/kube/main.qml"; | 233 | const auto file = "/org/kube/components/kube/main.qml"; |
228 | const auto mainFile = findFile(file, engine.importPathList()); | 234 | const auto mainFile = findFile(file, engine.importPathList()); |
229 | if (mainFile.isEmpty()) { | 235 | if (mainFile.isEmpty()) { |