Browse Source

Fixes: 1) Building fails w/o "CONFIG += strace_win" 2) mingw build

Commenting Mingw release flags section for now. Strace is not reliable with mingw (only calls to other libraries are resolved, internal calls show up as addresses).
adaptive-webui-19844
Nick Tiskov 12 years ago
parent
commit
5eaf4201ae
  1. 4
      src/main.cpp
  2. 8
      src/src.pro

4
src/main.cpp

@ -154,9 +154,11 @@ void sigsegvHandler(int) { @@ -154,9 +154,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);
}
@ -169,9 +171,11 @@ void sigabrtHandler(int) { @@ -169,9 +171,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);
}

8
src/src.pro

@ -256,7 +256,10 @@ strace_win:win32:{ @@ -256,7 +256,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"
@ -264,7 +267,8 @@ strace_win:win32:{ @@ -264,7 +267,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 \

Loading…
Cancel
Save