Get rid of ifdefs for crash handler in main.cpp.

Adapt the *.pro and *.qbp files to build unconditionally since the
ifdefs are already inlined in the functions.

Change-Id: I492f39600222a6174d4e16546bfa5a289965e8cb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 2 insertions, 12 deletions

diff --git a/src/app/app.pro b/src/app/app.pro
index 85831adb6f..456d2eb1de 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -5,14 +5,8 @@ TEMPLATE = app
 TARGET = $$IDE_APP_TARGET
 DESTDIR = $$IDE_APP_PATH
 
-SOURCES += main.cpp
-linux-* {
-    # Build only in debug mode.
-    debug_and_release|CONFIG(debug, debug|release) {
-        HEADERS += ../tools/qtcreatorcrashhandler/crashhandlersetup.h
-        SOURCES += ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp
-    }
-}
+HEADERS += ../tools/qtcreatorcrashhandler/crashhandlersetup.h
+SOURCES += main.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp
 
 include(../rpath.pri)
 
diff --git a/src/app/main.cpp b/src/app/main.cpp
index fcef58ed99..e96692b04f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -229,9 +229,7 @@ int main(int argc, char **argv)
     const int threadCount = QThreadPool::globalInstance()->maxThreadCount();
     QThreadPool::globalInstance()->setMaxThreadCount(qMax(4, 2 * threadCount));
 
-#if defined(Q_OS_LINUX) && !defined(QT_NO_DEBUG)
     setupCrashHandler(); // Display a backtrace once a serious signal is delivered.
-#endif
 
 #ifdef ENABLE_QT_BREAKPAD
     QtSystemExceptionHandler systemExceptionHandler;
@@ -438,8 +436,6 @@ int main(int argc, char **argv)
 #endif
 
     const int r = app.exec();
-#if defined(Q_OS_LINUX) && !defined(QT_NO_DEBUG)
     cleanupCrashHandler();
-#endif
     return r;
 }