From 2b179a53bfbdadd2ac3cf5afffe9911ad58db8fd Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sat, 1 Jan 2011 17:03:23 +0000
Subject: [PATCH] Added --enable-debug switch to the configure script and
 remove related code from the project file

---
 configure   | 16 +++++++++++++++-
 qcm/qt4.qcm |  8 +++++++-
 src/src.pro |  6 +++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index de6c56c84..b6f0e535d 100755
--- a/configure
+++ b/configure
@@ -21,6 +21,7 @@ Dependency options:
   --disable-gui                                   Disable qBittorrent
                                                  Graphical user interface for
                                                  headless running
+  --enable-debug                                  Enable debug mode
   --with-libboost-inc=[path]                      Path to libboost include
                                                  files
   --with-libboost-lib=[path]                      Path to libboost library
@@ -158,6 +159,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--enable-debug)
+			QC_ENABLE_DEBUG="Y"
+			shift
+			;;
+
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -215,6 +221,7 @@ echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
 echo QC_DISABLE_GUI=$QC_DISABLE_GUI
+echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
 echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
@@ -328,6 +335,7 @@ cat >$1/modules.cpp <<EOT
 -----BEGIN QCMOD-----
 name: Qt >= 4.5
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
+arg: enable-debug, Enable debug mode
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -338,9 +346,14 @@ public:
 	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
+                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			conf->addExtra("CONFIG += nox");
-		}	
+		}
+                // Debug mode
+                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
+                  conf->addExtra("CONFIG += debug");
+                }
 		return(QT_VERSION >= 0x040500);
 	}
 };
@@ -1604,6 +1617,7 @@ export BINDIR
 export DATADIR
 export EX_QTDIR
 export QC_DISABLE_GUI
+export QC_ENABLE_DEBUG
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBBOOST_LIB
 export QC_DISABLE_libnotify
diff --git a/qcm/qt4.qcm b/qcm/qt4.qcm
index d7b4d228d..2b11633ca 100644
--- a/qcm/qt4.qcm
+++ b/qcm/qt4.qcm
@@ -2,6 +2,7 @@
 -----BEGIN QCMOD-----
 name: Qt >= 4.5
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
+arg: enable-debug, Enable debug mode
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -12,9 +13,14 @@ public:
 	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
+                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
 			conf->addExtra("CONFIG += nox");
-		}	
+		}
+                // Debug mode
+                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
+                  conf->addExtra("CONFIG += debug");
+                }
 		return(QT_VERSION >= 0x040500);
 	}
 };
diff --git a/src/src.pro b/src/src.pro
index 7c84f2977..ef31b1f24 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,12 +23,12 @@ QT += network
 LANG_PATH = lang
 ICONS_PATH = Icons
 
-# use "CONFIG -= debug" to disable debug
-CONFIG += debug
-#CONFIG += release
+CONFIG(debug, debug|release):message(Project is built in DEBUG mode.)
+CONFIG(release, debug|release):message(Project is built in RELEASE mode.)
 
 # Disable debug output in release mode
 !debug {
+   message(Disabling debug output.)
    DEFINES += QT_NO_DEBUG_OUTPUT
 }