OS/2 fixes from Silvan Scherrer

(cherry picked from commit 8cc538085f)
This commit is contained in:
Christophe Dumez 2012-03-19 18:33:38 +02:00
parent 0fad329b7e
commit 1c4ae8ffbf
3 changed files with 81 additions and 43 deletions

View file

@ -27,7 +27,6 @@ First you need to create the conf.pri file in the same dir as this readme.os2 is
the conf.pri file has the following content:
##### conf.pri content beginn #####
PREFIX = .
BINDIR = ./bin
INCDIR = ./include
LIBDIR = ./lib

View file

@ -11,7 +11,7 @@ QBittorrent installation
3. INSTALLATION
4. CONTACT
4. BUGREPORTS
5. CREDITS
@ -29,17 +29,70 @@ Welcome to QBittorrent port for OS/2 and eComStation.
2. REQUIREMENTS
===============
* klibc 0.6.3 or later
The following requirements can be installed either by rpm or by zip files.
ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
RPM Installation:
* openssl 1.0
ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
klibc
-----
* Qt4 dll
1. yum install libc
see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
openssl 1.0
-----------
1. yum install openssl
pthread
-------
1. yum install pthread
GCC4Core
--------
1. yum install libgcc
2. yum install gcc-stack-protector
3. yum install gcc-stdc++-shared-library
4. yum install gcc-supc++-shared-library
Qt4 dll
-------
1. yum install libqt4
ZIP Installation:
klibc
-----
1. Download klibc 0.6.4 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
-----------
1. Download the zip file from http://rpm.netlabs.org/release/00/zip
2. Install the files to your libpath eg. x:\ecs\dll
pthread
-------
1. Download pthread 2012-03-13 or better from http://rpm.netlabs.org/release/00/zip
2. Install the files to your libpath eg. x:\ecs\dll
GCC4Core
--------
1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
2. Install the files to your libpath eg. x:\ecs\dll
Qt4 dll
-------
1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more information)
2. Install the files according to the readme
3. INSTALLATION
@ -47,30 +100,6 @@ Welcome to QBittorrent port for OS/2 and eComStation.
To install QBittorrent, do the following:
klibc
-----
1. Download klibc 0.6.3 csd3 or later.
2. Install the package by double-clicking on the WPI file.
openssl 1.0
-----------
1. Download the zip file
2. Install the files to your libpath eg. x:\ecs\dll
Qt4 dll
-------
1. Download the package
2. Install the package by double-clicking on the wpi file.
QBittorrent
-----------
1. Create a directory for QBittorrent.
2. Extract the QBittorrent package to the new directory.
3. Create a WPS object for QBittorrent.exe.
@ -78,18 +107,13 @@ QBittorrent
5. Happy torrenting
4. BUGREPORTS
=============
4. CONTACT
==========
Please send bugreports to:
ecs@aroa.ch
Please create bugreports at http://svn.netlabs.org/qtapps
Only bug reports with a reproducable bug are accepted. :-)
5. CREDITS
==========
@ -122,6 +146,20 @@ development, you can do so in one of the following ways:
7. HISTORY
==========
2012-03-15
* updated to 2.9.5 code level of QBittorrent
2011-09-26
* updated to 2.8.5 code level of QBittorrent
* updated to Qt 4.7.3
2011-06-20
* updated to 2.7.3 code level of QBittorrent
* updated libtorrent to 0.15.6 level
2010-12-23
* updated to 2.5.2 code level of QBittorrent

View file

@ -79,7 +79,7 @@ const int UNLEN = 256;
#endif
#endif // DISABLE_GUI
#ifdef Q_WS_WIN
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
#include <QDesktopServices>
#endif
@ -160,7 +160,8 @@ QString misc::QDesktopServicesCacheLocation() {
}
QString misc::QDesktopServicesDownloadLocation() {
#ifdef Q_WS_WIN
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
// as long as it stays WinXP like we do the same on OS/2
// TODO: Use IKnownFolderManager to get path of FOLDERID_Downloads
// instead of hardcoding "Downloads"
// Unfortunately, this would break compatibility with WinXP