mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move Windows backtrace functionality to the windows specific *.pri files.

Browse source
This commit is contained in:
sledgehammer999 2013-03-03 00:52:51 +02:00
parent 3705cb8067
commit 7b658a52dd
4 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/src.pro
View file

@ -235,38 +235,3 @@ TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \
$$LANG_PATH/qbittorrent_be.ts \ $$LANG_PATH/qbittorrent_be.ts \
$$LANG_PATH/qbittorrent_eu.ts \ $$LANG_PATH/qbittorrent_eu.ts \
$$LANG_PATH/qbittorrent_he.ts $$LANG_PATH/qbittorrent_he.ts
# Windows Stacktrace support
strace_win:win32:{
contains(QMAKE_HOST.arch, x86):{
# i686 arch requires frame pointer preservation
win32-g++:{
QMAKE_CXXFLAGS_RELEASE += -fno-omit-frame-pointer
QMAKE_CXXFLAGS_DEBUG += -fno-omit-frame-pointer
}
win32-msvc*:{
QMAKE_CXXFLAGS_RELEASE += -Oy-
QMAKE_CXXFLAGS_DEBUG += -Oy-
}
}
# Generate debug info in release builds
release:{
#win32-g++:{
# QMAKE_CXXFLAGS_RELEASE += -g
# QMAKE_LFLAGS_RELEASE -= -Wl,-s
#}
win32-msvc*:{
QMAKE_CXXFLAGS_RELEASE += -Zi
QMAKE_LFLAGS += "/DEBUG"
}
}
DEFINES += STACKTRACE_WIN
win32-msvc*:LIBS += dbghelp.lib
win32-g++:LIBS += libdbghelp
FORMS += stacktrace_win_dlg.ui
HEADERS += stacktrace_win.h \
stacktrace_win_dlg.h
}

13
winconf-mingw.pri
View file

@ -1,3 +1,16 @@
strace_win:{
contains(QMAKE_HOST.arch, x86):{
# i686 arch requires frame pointer preservation
QMAKE_CXXFLAGS_RELEASE += -fno-omit-frame-pointer
QMAKE_CXXFLAGS_DEBUG += -fno-omit-frame-pointer
}
release:{
#QMAKE_CXXFLAGS_RELEASE += -g
#QMAKE_LFLAGS_RELEASE -= -Wl,-s
}
LIBS += libdbghelp
}
RC_FILE = qbittorrent_mingw.rc RC_FILE = qbittorrent_mingw.rc
#You need to link with libtorrent > 0.15.5 (or svn) and you must #You need to link with libtorrent > 0.15.5 (or svn) and you must

13
winconf-msvc.pri
View file

@ -1,3 +1,16 @@
strace_win:{
contains(QMAKE_HOST.arch, x86):{
# i686 arch requires frame pointer preservation
QMAKE_CXXFLAGS_RELEASE += -Oy-
QMAKE_CXXFLAGS_DEBUG += -Oy-
}
release:{
QMAKE_CXXFLAGS_RELEASE += -Zi
QMAKE_LFLAGS += "/DEBUG"
}
LIBS += dbghelp.lib
}
RC_FILE = qbittorrent.rc RC_FILE = qbittorrent.rc
# Enable Wide characters # Enable Wide characters

7
winconf.pri
View file

@ -36,6 +36,13 @@ CONFIG(debug, debug|release) {
DEFINES += NDEBUG DEFINES += NDEBUG
} }
strace_win:{
DEFINES += STACKTRACE_WIN
FORMS += stacktrace_win_dlg.ui
HEADERS += stacktrace_win.h \
stacktrace_win_dlg.h
}
win32-g++ { win32-g++ {
include(winconf-mingw.pri) include(winconf-mingw.pri)
} }