diff --git a/src/main.cpp b/src/main.cpp
index 96bac9b8e..ad35ae107 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -152,9 +152,11 @@ void sigsegvHandler(int) {
   std::cerr << "qBittorrent version: " << VERSION << std::endl;
   print_stacktrace();
 #else
+#ifdef STACKTRACE_WIN
   StraceDlg dlg;
   dlg.setStacktraceString(straceWin::getBacktrace());
   dlg.exec();
+#endif
 #endif
   raise(SIGSEGV);
 }
@@ -167,9 +169,11 @@ void sigabrtHandler(int) {
   std::cerr << "qBittorrent version: " << VERSION << std::endl;
   print_stacktrace();
 #else
+#ifdef STACKTRACE_WIN
   StraceDlg dlg;
   dlg.setStacktraceString(straceWin::getBacktrace());
   dlg.exec();
+#endif
 #endif
   raise(SIGABRT);
 }
diff --git a/src/src.pro b/src/src.pro
index ab117c295..10f6e4bf1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -252,7 +252,10 @@ strace_win:win32:{
   
   # Generate debug info in release builds
   release:{
-    win32-g++:QMAKE_CXXFLAGS_RELEASE += -g
+    #win32-g++:{
+    #  QMAKE_CXXFLAGS_RELEASE += -g
+    #  QMAKE_LFLAGS_RELEASE -= -Wl,-s
+    #}
     win32-msvc*:{
       QMAKE_CXXFLAGS_RELEASE += -Zi
       QMAKE_LFLAGS += "/DEBUG"
@@ -260,7 +263,8 @@ strace_win:win32:{
   }
 
   DEFINES += STACKTRACE_WIN
-  LIBS += dbghelp.lib
+  win32-msvc*:LIBS += dbghelp.lib
+  win32-g++:LIBS += libdbghelp
 
   FORMS += stacktrace_win_dlg.ui
   HEADERS += stacktrace_win.h \