From 31682a0c136b76c0088e3204391fbaa2d00d8310 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Mon, 24 Sep 2012 09:56:31 +0200
Subject: [PATCH] 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>
---
 qtcreator.qbp    | 12 +++---------
 src/app/app.pro  | 10 ++--------
 src/app/main.cpp |  4 ----
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/qtcreator.qbp b/qtcreator.qbp
index ff7f72cc116..42126ac8669 100644
--- a/qtcreator.qbp
+++ b/qtcreator.qbp
@@ -162,7 +162,9 @@ Project {
             "src/shared/qtsingleapplication/qtsingleapplication.cpp",
             "src/shared/qtsingleapplication/qtlocalpeer.h",
             "src/shared/qtsingleapplication/qtlocalpeer.cpp",
-            "src/shared/qtlockedfile/qtlockedfile.cpp"
+            "src/shared/qtlockedfile/qtlockedfile.cpp",
+            "src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp",
+            "src/tools/qtcreatorcrashhandler/crashhandlersetup.h"
         ]
 
         Group {
@@ -179,14 +181,6 @@ Project {
            ]
         }
 
-        Group {
-           condition: qbs.targetOS == "linux"
-           files: [
-               "src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp",
-               "src/tools/qtcreatorcrashhandler/crashhandlersetup.h"
-           ]
-        }
-
         Group {
            condition: qbs.targetOS == "windows"
            files: [
diff --git a/src/app/app.pro b/src/app/app.pro
index 85831adb6fe..456d2eb1dee 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 fcef58ed991..e96692b04fb 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;
 }