From 676d6764b93e07e7ed9c73dd4b058fe7f3f4124e Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Thu, 5 Apr 2007 23:00:41 +0000 Subject: [PATCH] - Use PKGConfig again to configure libtorrent --- Changelog | 1 + configure | 2 +- qcm/libtorrent.qcm | 2 +- src/Icons/qBittorrent.desktop | 2 +- src/src.pro | 8 ++++---- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Changelog b/Changelog index 0601d5706..5a3834571 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ * Unknown - Christophe Dumez - v0.9.2 - BUGFIX: Window can now stay maximized on exit + - BUGFIX: Use PKGCONFIG again for configuring libtorrent * Wed Apr 04 2007 - Christophe Dumez - v0.9.1 - BUGFIX: A lot of fixes in configure file diff --git a/configure b/configure index 60ad32d8d..3096f88b9 100755 --- a/configure +++ b/configure @@ -342,7 +342,7 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - conf->addLib("-ltorrent"); + //conf->addLib("-ltorrent"); return true; } }; diff --git a/qcm/libtorrent.qcm b/qcm/libtorrent.qcm index a5299703f..80c3c0f41 100644 --- a/qcm/libtorrent.qcm +++ b/qcm/libtorrent.qcm @@ -56,7 +56,7 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - conf->addLib("-ltorrent"); + //conf->addLib("-ltorrent"); return true; } }; diff --git a/src/Icons/qBittorrent.desktop b/src/Icons/qBittorrent.desktop index 05b03472a..58f00d2f8 100644 --- a/src/Icons/qBittorrent.desktop +++ b/src/Icons/qBittorrent.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Qt;Application;Network;P2P -Comment=V0.9.1 +Comment=V0.9.2 Encoding=UTF-8 Exec=qbittorrent GenericName=Bittorrent client diff --git a/src/src.pro b/src/src.pro index 36159a327..0744ded66 100644 --- a/src/src.pro +++ b/src/src.pro @@ -11,10 +11,10 @@ TARGET = qbittorrent CONFIG += qt thread x11 # Update this VERSION for each release -DEFINES += VERSION=\\\"v0.9.1\\\" +DEFINES += VERSION=\\\"v0.9.2rc1\\\" DEFINES += VERSION_MAJOR=0 DEFINES += VERSION_MINOR=9 -DEFINES += VERSION_BUGFIX=1 +DEFINES += VERSION_BUGFIX=2 contains(DEBUG_MODE, 1){ CONFIG += debug @@ -28,8 +28,8 @@ contains(DEBUG_MODE, 0){ QMAKE_CXXFLAGS_RELEASE += -fwrapv QMAKE_CXXFLAGS_DEBUG += -fwrapv #LIBS += -lcurl -#CONFIG += link_pkgconfig -#PKGCONFIG += libtorrent +CONFIG += link_pkgconfig +PKGCONFIG += libtorrent QT += network DEFINES += QT_NO_CAST_TO_ASCII