X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=aa1c75ad12a0fae734cf4624ff937de3c707a216;hb=refs%2Fheads%2F0.3.0-backport;hp=5ce1ac9ccaf33cf0f31e19b5e6d2e3b7c3798180;hpb=4cf82c9e10e1301ddfc47e5ac23e22b96ffb0bf3;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index 5ce1ac9c..aa1c75ad 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -54,7 +54,7 @@ #include -#if not defined(Q_OS_WIN32) && not defined(MAC_10_4_SDK) +#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) #include #include #include @@ -66,8 +66,9 @@ void handle_signal(int sig) { QCoreApplication::quit(); } -#if not defined(Q_OS_WIN32) && not defined(MAC_10_4_SDK) +#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) void handle_crash(int sig) { + Q_UNUSED(sig) void* callstack[128]; int i, frames = backtrace(callstack, 128); @@ -128,7 +129,7 @@ void handle_crash(int sig) { dumpFile.close(); exit(27); } -#endif // ifndef Q_OS_WIN32 +#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) int main(int argc, char **argv) { @@ -136,11 +137,11 @@ int main(int argc, char **argv) { signal(SIGTERM, handle_signal); signal(SIGINT, handle_signal); -#if not defined(Q_OS_WIN32) && not defined(MAC_10_4_SDK) +#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) signal(SIGABRT, handle_crash); signal(SIGBUS, handle_crash); signal(SIGSEGV, handle_crash); -#endif // ndef Q_OS_WIN32 +#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC) Global::registerMetaTypes(); Global::setupVersion(); @@ -168,8 +169,6 @@ int main(int argc, char **argv) { QtUiApplication app(argc, argv); #endif - - Global::parser = CliParser(QCoreApplication::arguments()); #ifndef BUILD_QTUI