OS/2 Fixes from Silvan Scherrer

This commit is contained in:
Christophe Dumez 2012-09-06 15:40:03 +03:00
parent 7af964cfe6
commit 2a5c9ae382
3 changed files with 24 additions and 3 deletions

View file

@ -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. 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: Simply type:
$ qmake $ qmake
@ -50,6 +53,16 @@ $ qmake
Followed by: Followed by:
$ make $ 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 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: If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:

View file

@ -67,7 +67,7 @@ ZIP Installation:
klibc 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 2. Install the files to your libpath eg x:\ecs\dll
openssl 1.0 openssl 1.0
@ -146,6 +146,14 @@ development, you can do so in one of the following ways:
7. HISTORY 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 2012-03-15
* updated to 2.9.5 code level of QBittorrent * updated to 2.9.5 code level of QBittorrent

View file

@ -401,7 +401,7 @@ QString fsutils::QDesktopServicesDataLocation() {
} }
QString fsutils::QDesktopServicesCacheLocation() { QString fsutils::QDesktopServicesCacheLocation() {
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
return QDesktopServicesDataLocation() + QLatin1String("\\cache"); return QDesktopServicesDataLocation() + QLatin1String("\\cache");
#else #else
#ifdef Q_WS_MAC #ifdef Q_WS_MAC