summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Pinon <vpinon@kde.org>2016-12-05 16:18:42 (GMT)
committerVincent Pinon <vpinon@kde.org>2016-12-06 07:30:59 (GMT)
commitae665d1607b54696bd174ab083360642af733108 (patch)
tree5c473004a4289b578f4b2fe01ae50932399755e9
parent26a7fafec6da88eaa8b87b05c21ace04d0e80659 (diff)
fix startup on windows
-rw-r--r--src/main.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp
index fe6b570..1defb5c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,14 +59,12 @@ int main(int argc, char *argv[])
KConfigGroup initialGroup(config, "version");
if (!initialGroup.exists()) {
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- if (env.contains(QStringLiteral("XDG_CURRENT_DESKTOP"))) {
- if (env.value(QStringLiteral("XDG_CURRENT_DESKTOP")).toLower() != QLatin1String("kde")) {
- // We are not on a KDE desktop, force breeze icon theme
- grp.writeEntry("force_breeze", true);
- qDebug()<<"Non KDE Desktop detected, forcing Breeze icon theme";
- } else {
- qDebug()<<"KDE Desktop detected, using system icons";
- }
+ if (env.contains(QStringLiteral("XDG_CURRENT_DESKTOP")) && env.value(QStringLiteral("XDG_CURRENT_DESKTOP")).toLower() == QLatin1String("kde")) {
+ qDebug()<<"KDE Desktop detected, using system icons";
+ } else {
+ // We are not on a KDE desktop, force breeze icon theme
+ grp.writeEntry("force_breeze", true);
+ qDebug()<<"Non KDE Desktop detected, forcing Breeze icon theme";
}
}
@@ -102,9 +100,11 @@ int main(int argc, char *argv[])
// Register about data
KAboutData::setApplicationData(aboutData);
+#ifndef __MINGW32__
// Add rcc stored icons to the search path so that we always find our icons
KIconLoader *loader = KIconLoader::global();
loader->reconfigure("kdenlive", QStringList() << QStringLiteral(":/pics"));
+#endif
// Set app stuff from about data
app.setApplicationDisplayName(aboutData.displayName());