This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 30 Aug 2015 00:28:50 +0200 Subject: [PATCH] do not check qmake existance Fix ./configure error: checking for mxe/usr/i686-w64-mingw32.static/qt/bin/qmake... configure: error: cannot check for file existence when cross compiling diff --git a/configure b/configure index 1111111..2222222 100755 --- a/configure +++ b/configure @@ -4540,7 +4540,7 @@ if eval \${$as_ac_File+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + echo "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$QT_QMAKE/qmake"; then eval "$as_ac_File=yes" else From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 30 Aug 2015 01:58:17 +0200 Subject: [PATCH] convert includes like to lowercase diff --git a/src/app/application.cpp b/src/app/application.cpp index 1111111..2222222 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -35,7 +35,7 @@ #ifndef DISABLE_GUI #ifdef Q_OS_WIN -#include +#include #include #include #endif // Q_OS_WIN diff --git a/src/core/misc.cpp b/src/core/misc.cpp index 1111111..2222222 100644 --- a/src/core/misc.cpp +++ b/src/core/misc.cpp @@ -54,7 +54,7 @@ #ifdef Q_OS_WIN #include -#include +#include const int UNLEN = 256; #else #include diff --git a/src/core/preferences.cpp b/src/core/preferences.cpp index 1111111..2222222 100644 --- a/src/core/preferences.cpp +++ b/src/core/preferences.cpp @@ -46,7 +46,7 @@ #endif #ifdef Q_OS_WIN -#include +#include #include #endif diff --git a/src/core/qtlibtorrent/filterparserthread.h b/src/core/qtlibtorrent/filterparserthread.h index 1111111..2222222 100644 --- a/src/core/qtlibtorrent/filterparserthread.h +++ b/src/core/qtlibtorrent/filterparserthread.h @@ -45,7 +45,7 @@ using namespace std; // P2B Stuff #include #ifdef Q_OS_WIN -#include +#include #else #include #endif diff --git a/src/core/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp index 1111111..2222222 100644 --- a/src/core/qtlibtorrent/qtorrenthandle.cpp +++ b/src/core/qtlibtorrent/qtorrenthandle.cpp @@ -48,7 +48,7 @@ #include #ifdef Q_OS_WIN -#include +#include #endif using namespace libtorrent; diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp index 1111111..2222222 100644 --- a/src/gui/powermanagement/powermanagement.cpp +++ b/src/gui/powermanagement/powermanagement.cpp @@ -40,7 +40,7 @@ #endif #ifdef Q_OS_WIN -#include +#include #endif PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false) From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 30 Aug 2015 01:59:15 +0200 Subject: [PATCH] remove unused members of peerlistwidget They were still generated by MOC and caused compilation errors diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h index 1111111..2222222 100644 --- a/src/gui/properties/peerlistwidget.h +++ b/src/gui/properties/peerlistwidget.h @@ -83,11 +83,6 @@ protected slots: void saveSettings() const; void showPeerListMenu(const QPoint&); -#if LIBTORRENT_VERSION_NUM < 10000 - void limitUpRateSelectedPeers(const QStringList& peer_ips); - void limitDlRateSelectedPeers(const QStringList& peer_ips); -#endif - void banSelectedPeers(const QStringList& peer_ips); void handleSortColumnChanged(int col); From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 30 Aug 2015 02:02:39 +0200 Subject: [PATCH] fix library list Replace library list hardcoded in qmake files with libraries found by autotools. diff --git a/configure b/configure index 1111111..2222222 100755 --- a/configure +++ b/configure @@ -8469,7 +8469,7 @@ fi $as_echo "$as_me: Running qmake to generate the makefile..." >&6;} CONFDIR="$( cd "$( dirname "$0" )" && pwd )" -$QT_QMAKE -r $CONFDIR/qbittorrent.pro +$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE" "CONF_LIBS=$LIBS" ret="$?" diff --git a/winconf-mingw.pri b/winconf-mingw.pri index 1111111..2222222 100644 --- a/winconf-mingw.pri +++ b/winconf-mingw.pri @@ -17,19 +17,8 @@ CONFIG(debug, debug|release) { RC_FILE = qbittorrent_mingw.rc -# Adapt the lib names/versions accordingly -CONFIG(debug, debug|release) { - LIBS += libtorrent \ - libboost_system-mgw45-mt-d-1_47 \ - libboost_filesystem-mgw45-mt-d-1_47 \ - libboost_thread-mgw45-mt-d-1_47 -} else { - LIBS += libtorrent \ - libboost_system-mgw45-mt-1_47 \ - libboost_filesystem-mgw45-mt-1_47 \ - libboost_thread-mgw45-mt-1_47 -} +LIBS += $$CONF_LIBS LIBS += libadvapi32 libshell32 libuser32 -LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll +LIBS += libcrypto libssl libwsock32 libws2_32 libz libiconv LIBS += libpowrprof diff --git a/winconf.pri b/winconf.pri index 1111111..2222222 100644 --- a/winconf.pri +++ b/winconf.pri @@ -9,15 +9,6 @@ INCLUDEPATH += $$quote(C:/qBittorrent/Zlib/include) # Point this to the openssl include folder INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include) -# Point this to the boost lib folder -LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib) -# Point this to the libtorrent lib folder -LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/) -# Point this to the zlib lib folder -LIBS += $$quote(-LC:/qBittorrent/Zlib/lib) -# Point this to the openssl lib folder -LIBS += $$quote(-LC:/qBittorrent/openssl/lib) - # LIBTORRENT DEFINES DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 @@ -47,12 +38,7 @@ CONFIG(debug, debug|release) { # Enable backtrace support CONFIG += strace_win -win32-g++ { - include(winconf-mingw.pri) -} -else { - include(winconf-msvc.pri) -} +include(winconf-mingw.pri) DEFINES += WITH_GEOIP_EMBEDDED message("On Windows, GeoIP database must be embedded.")