From b853064a34deb506cd09ba5ac4b6f368062ef0b4 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Tue, 5 Jan 2016 23:55:04 +0300
Subject: qbittorrent: import/export patch

This commit was not ammended into previous commit to
keep diff of previous commit simple.
---
 plugins/apps/qbittorrent-1-fixes.patch | 52 +++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch
index b2c7e6f..af1cb2a 100644
--- a/plugins/apps/qbittorrent-1-fixes.patch
+++ b/plugins/apps/qbittorrent-1-fixes.patch
@@ -18,7 +18,7 @@ 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 :
+@@ -4500,7 +4500,7 @@ if eval \${$as_ac_File+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    test "$cross_compiling" = yes &&
@@ -74,24 +74,24 @@ index 1111111..2222222 100644
  #include <QSharedMemory>
  #include <QSessionManager>
  #endif // Q_OS_WIN
-diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp
+diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp
 index 1111111..2222222 100644
---- a/src/base/utils/misc.cpp
-+++ b/src/base/utils/misc.cpp
-@@ -54,7 +54,7 @@
+--- a/src/base/bittorrent/torrenthandle.cpp
++++ b/src/base/bittorrent/torrenthandle.cpp
+@@ -43,7 +43,7 @@
+ #include <boost/bind.hpp>
  
  #ifdef Q_OS_WIN
- #include <windows.h>
--#include <PowrProf.h>
-+#include <powrprof.h>
- const int UNLEN = 256;
- #else
- #include <unistd.h>
+-#include <Windows.h>
++#include <windows.h>
+ #endif
+ 
+ #include "base/logger.h"
 diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
 index 1111111..2222222 100644
 --- a/src/base/preferences.cpp
 +++ b/src/base/preferences.cpp
-@@ -46,7 +46,7 @@
+@@ -47,7 +47,7 @@
  #endif
  
  #ifdef Q_OS_WIN
@@ -100,19 +100,19 @@ index 1111111..2222222 100644
  #include <winreg.h>
  #endif
  
-diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp
-index de6ca9c..40b2498 100644
---- a/src/base/bittorrent/torrenthandle.cpp
-+++ b/src/base/bittorrent/torrenthandle.cpp
-@@ -43,7 +43,7 @@
- #include <boost/bind.hpp>
+diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp
+index 1111111..2222222 100644
+--- a/src/base/utils/misc.cpp
++++ b/src/base/utils/misc.cpp
+@@ -48,7 +48,7 @@
  
  #ifdef Q_OS_WIN
--#include <Windows.h>
-+#include <windows.h>
- #endif
- 
- #include "base/logger.h"
+ #include <windows.h>
+-#include <PowrProf.h>
++#include <powrprof.h>
+ const int UNLEN = 256;
+ #else
+ #include <unistd.h>
 diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp
 index 1111111..2222222 100644
 --- a/src/gui/powermanagement/powermanagement.cpp
@@ -139,7 +139,7 @@ diff --git a/configure b/configure
 index 1111111..2222222 100755
 --- a/configure
 +++ b/configure
-@@ -8469,7 +8469,7 @@ fi
+@@ -8345,7 +8345,7 @@ fi
  $as_echo "$as_me: Running qmake to generate the makefile..." >&6;}
  CONFDIR="$( cd "$( dirname "$0" )" && pwd )"
  
@@ -152,7 +152,7 @@ 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) {
+@@ -20,19 +20,8 @@ CONFIG(debug, debug|release) {
  
  RC_FILE = qbittorrent_mingw.rc
  
@@ -194,7 +194,7 @@ index 1111111..2222222 100644
  # LIBTORRENT DEFINES
  DEFINES += BOOST_ALL_NO_LIB
  DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021
-@@ -47,9 +38,4 @@ CONFIG(debug, debug|release) {
+@@ -46,9 +37,4 @@ CONFIG(debug, debug|release) {
  # Enable backtrace support
  CONFIG += strace_win
  
-- 
cgit v0.12