Browse Source

Fix warnings by qmake -Wall, cleanups

adaptive-webui-19844
Chocobo1 9 years ago
parent
commit
be34f29b05
  1. 10
      winconf-mingw.pri
  2. 8
      winconf-msvc.pri

10
winconf-mingw.pri

@ -1,5 +1,5 @@
strace_win:{ strace_win{
contains(QMAKE_HOST.arch, x86):{ contains(QMAKE_HOST.arch, x86) {
# i686 arch requires frame pointer preservation # i686 arch requires frame pointer preservation
QMAKE_CXXFLAGS_RELEASE += -fno-omit-frame-pointer QMAKE_CXXFLAGS_RELEASE += -fno-omit-frame-pointer
QMAKE_CXXFLAGS_DEBUG += -fno-omit-frame-pointer QMAKE_CXXFLAGS_DEBUG += -fno-omit-frame-pointer
@ -17,11 +17,7 @@ CONFIG(debug, debug|release) {
RC_FILE = qbittorrent_mingw.rc RC_FILE = qbittorrent_mingw.rc
#You need to link with libtorrent > 0.15.5 (or svn) and you must # Adapt the lib names/versions accordingly
#configure libtorrent to use iconv in the building process. This is
#needed for correct Unicode support.
#Adapt the lib names/versions accordingly
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
LIBS += libtorrent \ LIBS += libtorrent \
libboost_system-mgw45-mt-d-1_47 \ libboost_system-mgw45-mt-d-1_47 \

8
winconf-msvc.pri

@ -1,10 +1,10 @@
strace_win:{ strace_win {
contains(QMAKE_HOST.arch, x86):{ contains(QMAKE_HOST.arch, x86) {
# i686 arch requires frame pointer preservation # i686 arch requires frame pointer preservation
QMAKE_CXXFLAGS_RELEASE += -Oy- QMAKE_CXXFLAGS_RELEASE += -Oy-
QMAKE_CXXFLAGS_DEBUG += -Oy- QMAKE_CXXFLAGS_DEBUG += -Oy-
} }
release:{ release {
QMAKE_CXXFLAGS_RELEASE += -Zi QMAKE_CXXFLAGS_RELEASE += -Zi
QMAKE_LFLAGS += "/DEBUG" QMAKE_LFLAGS += "/DEBUG"
} }
@ -18,7 +18,7 @@ RC_FILE = qbittorrent.rc
# Enable Wide characters # Enable Wide characters
DEFINES += TORRENT_USE_WPATH DEFINES += TORRENT_USE_WPATH
#Adapt the lib names/versions accordingly # Adapt the lib names/versions accordingly
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
LIBS += libtorrentd.lib \ LIBS += libtorrentd.lib \
libboost_system-vc90-mt-sgd-1_51.lib libboost_system-vc90-mt-sgd-1_51.lib

Loading…
Cancel
Save