From 30e0cc20c87a8093d58b662c04e7ff8a8520a5b1 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Thu, 6 Sep 2012 15:40:03 +0300
Subject: [PATCH] OS/2 Fixes from Silvan Scherrer

---
 README.os2       | 15 ++++++++++++++-
 install.os2      | 10 +++++++++-
 src/fs_utils.cpp |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/README.os2 b/README.os2
index d388d9862..1d0ef7522 100644
--- a/README.os2
+++ b/README.os2
@@ -42,7 +42,10 @@ LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
 
 Of course all the above path references have to be adjusted to your build env.
 
-It should now be easy to build qBittorrent:
+Now you can either do a normal build or a shadow build. A shadow build has the
+advantage that no created files are in the same dir as the sources are.
+
+For a normal build do the following:
 
 Simply type:
 $ qmake
@@ -50,6 +53,16 @@ $ qmake
 Followed by:
 $ make
 
+For a shadow build do the following:
+given your sources are in x:\trees\qbittorrent\trunk create a 
+x:\trees\qbittorrent\build directory
+
+Now switch to the created directory and type:
+$ qmake ..\trunk
+
+Followed by:
+$ make
+
 If all works fine you should get a working qbittorrent executable.
 
 If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:
diff --git a/install.os2 b/install.os2
index c119e18ed..b1fe405bd 100644
--- a/install.os2
+++ b/install.os2
@@ -67,7 +67,7 @@ ZIP Installation:
 klibc
 -----
 
-  1. Download klibc 0.6.4 or better (see http://svn.netlabs.org/libc for more information)
+  1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for more information)
   2. Install the files to your libpath eg x:\ecs\dll
 
 openssl 1.0
@@ -146,6 +146,14 @@ development, you can do so in one of the following ways:
 7. HISTORY
 ==========
 
+2012-09-06
+
+  * updated to 3.0.2 code level of QBittorrent
+
+2012-05-14
+
+  * updated to 2.9.8 code level of QBittorrent
+
 2012-03-15
 
   * updated to 2.9.5 code level of QBittorrent
diff --git a/src/fs_utils.cpp b/src/fs_utils.cpp
index 7bb0f656f..08c63c655 100644
--- a/src/fs_utils.cpp
+++ b/src/fs_utils.cpp
@@ -401,7 +401,7 @@ QString fsutils::QDesktopServicesDataLocation() {
 }
 
 QString fsutils::QDesktopServicesCacheLocation() {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
   return QDesktopServicesDataLocation() + QLatin1String("\\cache");
 #else
 #ifdef Q_WS_MAC