projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this should hopefully fix the dreaded BR #140 (sync to core hangs)
[quassel.git]
/
src
/
common
/
main.cpp
diff --git
a/src/common/main.cpp
b/src/common/main.cpp
index
3c36a28
..
9dab54c
100644
(file)
--- a/
src/common/main.cpp
+++ b/
src/common/main.cpp
@@
-54,7
+54,7
@@
//! Signal handler for graceful shutdown.
void handle_signal(int sig) {
//! Signal handler for graceful shutdown.
void handle_signal(int sig) {
- qWarning(
QString("Caught signal %1 - exiting.").arg(sig).toAscii(
));
+ qWarning(
"%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig)
));
QCoreApplication::quit();
}
QCoreApplication::quit();
}
@@
-66,8
+66,7
@@
int main(int argc, char **argv) {
// Logger logger;
Global::registerMetaTypes();
// Logger logger;
Global::registerMetaTypes();
-
-#include "../../version.inc"
+ Global::setupVersion();
#if defined BUILD_CORE
Global::runMode = Global::CoreOnly;
#if defined BUILD_CORE
Global::runMode = Global::CoreOnly;
@@
-80,7
+79,7
@@
int main(int argc, char **argv) {
QApplication app(argc, argv);
#endif
QApplication app(argc, argv);
#endif
- qsrand(Q
DateTime::currentDateTime().toTime_t(
));
+ qsrand(Q
Time(0,0,0).secsTo(QTime::currentTime()
));
// Set up i18n support
QLocale locale = QLocale::system();
// Set up i18n support
QLocale locale = QLocale::system();