projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
09ced75
)
Move KAboutData initialization before app initialization
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Sun, 8 Feb 2015 23:58:16 +0000
(
00:58
+0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Sun, 8 Feb 2015 23:58:16 +0000
(
00:58
+0100)
src/common/main.cpp
patch
|
blob
|
history
diff --git
a/src/common/main.cpp
b/src/common/main.cpp
index
9d75da4
..
3f6cab5
100644
(file)
--- a/
src/common/main.cpp
+++ b/
src/common/main.cpp
@@
-190,9
+190,6
@@
int main(int argc, char **argv)
}
#endif
}
#endif
- if (!app.init())
- return EXIT_FAILURE;
-
#ifdef HAVE_KF5
// FIXME: This should be done after loading the translation catalogue, but still in main()
AboutData aboutData;
#ifdef HAVE_KF5
// FIXME: This should be done after loading the translation catalogue, but still in main()
AboutData aboutData;
@@
-200,5
+197,8
@@
int main(int argc, char **argv)
KAboutData::setApplicationData(aboutData.kAboutData());
#endif
KAboutData::setApplicationData(aboutData.kAboutData());
#endif
+ if (!app.init())
+ return EXIT_FAILURE;
+
return app.exec();
}
return app.exec();
}