diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cf7687be..924478431 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,13 +22,8 @@ add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR}) add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX}) add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD}) -# os2 { -# DEFINES += DQBT_VERSION=\'\"v$${PROJECT_VERSION}\"\' -# DEFINES += DQBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\' -# } else { add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}") add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}") -# } if (UNIX AND NOT APPLE) include(GNUInstallDirs) diff --git a/README.os2 b/README.os2 deleted file mode 100644 index 13551c93f..000000000 --- a/README.os2 +++ /dev/null @@ -1,74 +0,0 @@ -qBittorrent - A BitTorrent client in Qt4 ------------------------------------------- - -This is the eComStation (OS/2) qBittorrent part of the readme. See also README for more general information. - - -Building qBittorrent -******************** - - -Requirements -============ - -- gcc based build env (recommended gcc v4.4.2 or greater) - -- Qt4 for eCS (OS/2) dev package (see http://svn.netlabs.org/qt4 for more information) - -- libtorrent-rasterbar for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information) - -- boost for eCS (OS/2) port (see http://svn.netlabs.org/ports for more information) - - -How to build -============ - -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 begin ##### -BINDIR = ./bin -INCDIR = ./include -LIBDIR = ./lib -DATADIR = ./share - -CONFIG += staticlib -INCLUDEPATH += x:/trees/libtorrent/trunk/include -LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \ - -Lx:/trees/boost/trunk/stage/lib \ - -Lx:/trees/openssl \ - -Lx:/extras/lib -##### conf.pri content end ##### - -Of course all the above path references have to be adjusted to your build env. - -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 - -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: -#netlabs on irc.freenode.net - ------------------------------------------- -Silvan Scherrer - - diff --git a/dist/unix/qbittorrent.appdata.xml b/dist/unix/qbittorrent.appdata.xml index 8d3214ad0..908a2928b 100644 --- a/dist/unix/qbittorrent.appdata.xml +++ b/dist/unix/qbittorrent.appdata.xml @@ -11,7 +11,7 @@ Aiming to be a good alternative to all other bittorrent clients out there, qBittorrent is fast, stable and provides unicode support as well as many other features. Additionally, qBittorrent runs and provides those - same features on all major platforms (Linux, Mac OS X, Windows, OS/2, FreeBSD). + same features on all major platforms (Linux, Mac OS X, Windows, FreeBSD).

It is programmed in C++ / Qt and uses libtorrent (sometimes called diff --git a/install.os2 b/install.os2 deleted file mode 100644 index 17737b26a..000000000 --- a/install.os2 +++ /dev/null @@ -1,187 +0,0 @@ -QBittorrent installation - - - -0. CONTENTS OF THIS FILE -======================== - -1. INTRODUCTION - -2. REQUIREMENTS - -3. INSTALLATION - -4. BUGREPORTS - -5. CREDITS - -6. SUPPORT AND DONATIONS - -7. HISTORY - - -1. INTRODUCTION -=============== - -Welcome to QBittorrent port for OS/2 and eComStation. - - -2. REQUIREMENTS -=============== - -The following requirements can be installed either by rpm or by zip files. - -RPM Installation: - -klibc ------ - - 1. yum install libc - -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.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 ------------ - - 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 -=============== - -To install QBittorrent, do the following: - - 1. Create a directory for QBittorrent. - 2. Extract the QBittorrent package to the new directory. - 3. Create a WPS object for QBittorrent.exe. - 4. Start QBittorrent - 5. Happy torrenting - - -4. BUGREPORTS -============= - -Please create bugreports at http://svn.netlabs.org/qtapps -Only bug reports with a reproducible bug are accepted. :-) - - -5. CREDITS -========== - -The port was done by: - -Silvan Scherrer aka _diver - -Thanks go to: - - * Dmitry A. Kuminov - -They either helped me when I had some nasty questions or did some testing for -me. - - -6. SUPPORT AND DONATIONS -======================== - -QBittorrent port is based on volunteer work. If you would like to support further -development, you can do so in one of the following ways: - - - * Donate to the Qt4 project: see qt.netlabs.org for more information - - * Contribute to the project: Besides actual development, this also includes - maintaining the documentation and the project web site as well as help - for users. - - -7. HISTORY -========== - -2012-09-19 - - * updated to 3.0.4 code level of QBittorrent - * updated libtorrent to 0.16.3 level - -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 - -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 - -2010-11-22 - - * updated to 2.4.11 code level of QBittorrent - -2010-xx-xx - - * initial port - diff --git a/os2conf.pri b/os2conf.pri deleted file mode 100644 index c27a9e77e..000000000 --- a/os2conf.pri +++ /dev/null @@ -1,16 +0,0 @@ -exists(conf.pri) { - # to the conf.pri goes all system dependent stuff - include(conf.pri) -} - -LIBS += \ - -ltorrent-rasterbar \ - -lboost_thread \ - -lboost_system \ - -lboost_filesystem \ - -lssl -lcrypto -lidn -lpthread -lz - -RC_FILE = qbittorrent_os2.rc - -# LIBTORRENT DEFINES -DEFINES += BOOST_ASIO_DYN_LINK diff --git a/qm_gen.pri b/qm_gen.pri index ae9d73e86..7d31a4c3c 100644 --- a/qm_gen.pri +++ b/qm_gen.pri @@ -2,7 +2,7 @@ TS_IN = $$fromfile(src/src.pro,TRANSLATIONS) TS_IN_NOEXT = $$replace(TS_IN,".ts","") isEmpty(QMAKE_LRELEASE) { - win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease unix { equals(QT_MAJOR_VERSION, 5) { diff --git a/src/qbittorrent_os2.ico b/src/qbittorrent_os2.ico deleted file mode 100644 index caf387921..000000000 Binary files a/src/qbittorrent_os2.ico and /dev/null differ diff --git a/src/qbittorrent_os2.rc b/src/qbittorrent_os2.rc deleted file mode 100644 index 3781f15e6..000000000 --- a/src/qbittorrent_os2.rc +++ /dev/null @@ -1 +0,0 @@ -ICON 1 DISCARDABLE "qbittorrent_os2.ico" diff --git a/src/src.pro b/src/src.pro index 081e6e825..17be690e0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -10,7 +10,6 @@ DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES win32: include(../winconf.pri) macx: include(../macxconf.pri) unix:!macx: include(../unixconf.pri) -os2: include(../os2conf.pri) QT += network xml diff --git a/version.pri b/version.pri index d0fc81ac8..494876b7b 100644 --- a/version.pri +++ b/version.pri @@ -22,11 +22,5 @@ DEFINES += QBT_VERSION_MINOR=$${VER_MINOR} DEFINES += QBT_VERSION_BUGFIX=$${VER_BUGFIX} DEFINES += QBT_VERSION_BUILD=$${VER_BUILD} -os2 { - DEFINES += QBT_VERSION=\'\"v$${PROJECT_VERSION}\"\' - DEFINES += QBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\' -} -else { - DEFINES += QBT_VERSION=\\\"v$${PROJECT_VERSION}\\\" - DEFINES += QBT_VERSION_2=\\\"$${PROJECT_VERSION}\\\" -} +DEFINES += QBT_VERSION=\\\"v$${PROJECT_VERSION}\\\" +DEFINES += QBT_VERSION_2=\\\"$${PROJECT_VERSION}\\\"