- Moved v1.0.x to a branch so that we work on v1.1.x in trunk

This commit is contained in:
Christophe Dumez
2007-11-06 11:07:07 +00:00
parent b7fd7d9837
commit 6ae21c2919
156 changed files with 35531 additions and 17986 deletions

View File

@@ -3,7 +3,7 @@ LANG_PATH = lang
ICONS_PATH = Icons
#Set the following variable to 1 to enable debug
DEBUG_MODE = 1
DEBUG_MODE = 0
# Global
TEMPLATE = app
@@ -11,7 +11,7 @@ TARGET = qbittorrent
CONFIG += qt thread x11 network
# Update this VERSION for each release
DEFINES += VERSION=\\\"v1.0.0beta5\\\"
DEFINES += VERSION=\\\"v1.0.0rc7\\\"
DEFINES += VERSION_MAJOR=1
DEFINES += VERSION_MINOR=0
DEFINES += VERSION_BUGFIX=0
@@ -24,9 +24,14 @@ contains(DEBUG_MODE, 1){
contains(DEBUG_MODE, 0){
CONFIG -= debug
CONFIG += release
DEFINES += QT_NO_DEBUG_OUTPUT
message(Release build!)
}
# For libtorrent stuff
# (comment this if you are using libtorrent with debug enabled)
DEFINES += NDEBUG
# Install
!win32 {
@@ -48,7 +53,7 @@ contains(DEBUG_MODE, 0){
menuicon.path = $$PREFIX/share/applications/
INSTALLS += menuicon
icon16.files = menuicons/16x16/apps/qbittorrent.png
icon16.path = $$PREFIX/share/icons/hicolor/22x22/apps/
icon16.path = $$PREFIX/share/icons/hicolor/16x16/apps/
icon22.files = menuicons/22x22/apps/qbittorrent.png
icon22.path = $$PREFIX/share/icons/hicolor/22x22/apps/
icon24.files = menuicons/24x24/apps/qbittorrent.png
@@ -78,9 +83,7 @@ QMAKE_CXXFLAGS_DEBUG += -fwrapv -O1
CONFIG += link_pkgconfig
PKGCONFIG += libtorrent libccext2 libccgnu2
contains(DEFINES, HAVE_MAGICK){
#PKGCONFIG += ImageMagick++
}else{
!contains(DEFINES, HAVE_MAGICK){
message(ImageMagick disabled)
}
@@ -89,19 +92,6 @@ QT += network xml
DEFINES += QT_NO_CAST_TO_ASCII
#QT_NO_CAST_FROM_ASCII
contains(DEBUG_MODE, 0){
contains(QT_VERSION, 4.2.0) {
message(Qt 4.2.0 detected : enabling debug output because of a bug in this version of Qt)
}else{
contains(QT_VERSION, 4.2.1) {
message(Qt 4.2.1 detected : enabling debug output because of a bug in this version of Qt)
}else{
DEFINES += QT_NO_DEBUG_OUTPUT
}
}
CONFIG += release
}
# Windows
win32 {
LIBS += -ltorrent -lccext2 -lccgnu2
@@ -150,12 +140,14 @@ HEADERS += GUI.h misc.h options_imp.h about_imp.h \
bittorrent.h searchEngine.h \
rss.h rss_imp.h FinishedTorrents.h \
allocationDlg.h FinishedListDelegate.h \
qtorrenthandle.h downloadingTorrents.h
qtorrenthandle.h downloadingTorrents.h \
engineSelectDlg.h pluginSource.h \
arborescence.h qgnomelook.h
FORMS += MainWindow.ui options.ui about.ui \
properties.ui createtorrent.ui preview.ui \
login.ui downloadFromURL.ui addTorrentDialog.ui \
search.ui rss.ui seeding.ui bandwidth_limit.ui \
download.ui
download.ui engineSelect.ui pluginSource.ui
SOURCES += GUI.cpp \
main.cpp \
options_imp.cpp \
@@ -166,5 +158,7 @@ SOURCES += GUI.cpp \
rss_imp.cpp \
FinishedTorrents.cpp \
qtorrenthandle.cpp \
downloadingTorrents.cpp
downloadingTorrents.cpp \
engineSelectDlg.cpp \
downloadThread.cpp