Tagged v2.5.4 release

Fix qBittorrent shutdown problem (closes #682576)

AUTHORS

@@ -36,9 +36,9 @@ Images Authors:
   url: http://www.oxygen-icons.org
 
 * files: src/Icons/flags/*.png
-  copyright: Open Clip Art Library
-  license: Creative Commons Public Domain Dedication
-  url: http://www.openclipart.org
+  copyright: Mark James <mjames@gmail.com>
+  license: Public Domain
+  url: http://www.famfamfam.com
 
 * files: src/Icons/skin/*.png
   files: src/menuicons/YYxYY/*.png
@@ -76,7 +76,7 @@ Translations authors:
   - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
-  - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
+  - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
   - English: Christophe Dumez (chris@qbittorrent.org)
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)

Changelog

@@ -1,4 +1,34 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
+* Thu Jan 6 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.4
+    - BUGFIX: Added --enable-debug parameter to the configure script
+    - BUGFIX: Prioritize first and last pieces when sequential download is enabled
+    - BUGFIX: Some encoding fixes (Windows)
+    - BUGFIX: Display default password on stdout when using nox
+    - BUGFIX: Fix issues when search engines results contain a '|'
+    - BUGFIX: Avoid possible crash on exit when the IP filter is enabled (closes #695945)
+
+* Sat Jan 1 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.3
+    - BUGFIX: Fix priority up/down for multiple torrents at the same time (closes #692184)
+    - BUGFIX: Make sure the number of torrents is properly set on startup (closes #694135)
+    - BUGFIX: Fix scan directories saving (closes #694768)
+    - BUGFIX: Remove empty folders on torrent soft deletion (closes #695174)
+    - BUGFIX: Make sure the main window has focus on startup
+    - BUGFIX: Fix ampersand display in search tabs (closes #695715)
+
+* Sun Dec 19 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.2
+    - BUGFIX: Fix alternative speed icon staying pressed when disabled
+    - BUGFIX: Fix slot warning on startup
+    - BUGFIX: Fix alignment issues in program preferences
+    - BUGFIX: Make sure we don't move completed torrent to the temp directory
+    for checking (closes #602938)
+    - BUGFIX: Fix some 'File Not found' warning in the Web UI
+    - BUGFIX: Fix dangerous usage of vector iterator
+    - BUGFIX: No longer expand the first folder in the torrent content list
+    - BUGFIX: Fixes possible crash in the RSS Downloader dialog (closes #691426)
+
+* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.1
+    - BUGFIX: Fix possible crash when right-clicking on a torrent
+
+* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
     - FEATURE: qBittorrent can now act as a tracker
     - FEATURE: New and improved RSS feed automated downloader
     - FEATURE: Added feature to shutdown qbittorrent on torrents completion
@@ -8,8 +38,24 @@
     - FEATURE: Remember the last trackers used in the torrent creation tool
     - FEATURE: The optimal piece size is now automatically computed in the torrent creation tool
     - FEATURE: Bring up the connection settings when clicking on the connection status icon
+    - FEATURE: Major code refactoring and optimization
+    - FEATURE: Added "Amount downloaded/left" columns to transfer list
+    - FEATURE: Simplified proxy settings
+    - FEATURE: Optimized and improved the peer country resolution code
+    - FEATURE: Download first/last pieces first when sequential download is
+    enabled (Thanks Ahmad)
+    - FEATURE: Download first/last pieces first now applies to all media files
+    in the torrent (Thanks Ahmad)
+    - BUGFIX: Fix SOCKS5 proxy authentication in search engine(closes #680072)
+    - BUGFIX: Fix two advanced settings (ignore limits on LAN and protocol
+    overhead inclusion in rate limiter)
+    - BUGFIX: Fix strict super seeding (was not working)
+    - BUGFIX: Improve magnet save path handling (closes #683395)
+    - BUGFIX: Disable overwrite confirmation in torrent addition dialog (closes # 685269)
     - COSMETIC: Replaced message box by on-screen notification for download errors
     - COSMETIC: Improved the torrent creation tool appearance
+    - COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)
+    - COSMETIC: Use bigger alternative speed icon
     - OTHERS: Dropped support for Qt <= 4.4
 
 * Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0

configure

@@ -18,9 +18,11 @@ Main options:
   --help              This help text.
 
 Dependency options:
+  --enable-debug                                  Enable debug mode
   --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
@@ -32,7 +34,6 @@ Dependency options:
                                                  executable (please follow
                                                  instructions in
                                                  src/geoip/README)
-  --disable-qtsingleapplication                  Disable use of libboost
   --with-qtsingleapplication=[system|shipped]     Use the shipped
                                                  qtsingleapplication library
                                                  or the system one
@@ -152,11 +153,21 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--enable-debug)
+			QC_ENABLE_DEBUG="Y"
+			shift
+			;;
+
 		--disable-gui)
 			QC_DISABLE_GUI="Y"
 			shift
 			;;
 
+		--enable-debug)
+			QC_ENABLE_DEBUG="Y"
+			shift
+			;;
+
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -182,11 +193,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--disable-qtsingleapplication)
-			QC_DISABLE_qtsingleapplication="Y"
-			shift
-			;;
-
 		--with-qtsingleapplication=*)
 			QC_WITH_QTSINGLEAPPLICATION=$optarg
 			shift
@@ -213,13 +219,14 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
+echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 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
 echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
 echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
-echo QC_DISABLE_qtsingleapplication=$QC_DISABLE_qtsingleapplication
 echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
 fi
@@ -326,7 +333,9 @@ cat >$1/modules.cpp <<EOT
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.5
+arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
+arg: enable-debug, Enable debug mode
 -----END QCMOD-----
 */
 class qc_qt4 : public ConfObj
@@ -337,9 +346,14 @@ public:
 	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
+                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
-		}	
+			conf->addExtra("CONFIG += nox");
+		}
+                // Debug mode
+                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
+                  conf->addExtra("CONFIG += debug");
+                }
 		return(QT_VERSION >= 0x040500);
 	}
 };
@@ -534,7 +548,7 @@ public:
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
-			conf->addDefine("WITH_LIBNOTIFY");
+			conf->addExtra("CONFIG += libnotify");
 			for(int n = 0; n < incs.count(); ++n)
 				conf->addIncludePath(incs[n]);
 			if(!libs.isEmpty())
@@ -609,7 +623,7 @@ public:
 #line 1 "qtsingleapplication.qcm"
 /*
 -----BEGIN QCMOD-----
-name: libboost
+name: qtsingleapplication
 arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
 -----END QCMOD-----
 */
@@ -625,7 +639,7 @@ public:
                 s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
                 if(s.compare("system", Qt::CaseInsensitive) == 0) {
                   // System
-                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
+                  conf->addExtra("CONFIG += usesystemqtsingleapplication");
                   printf(" [system] ");
                 } else {
                   printf(" [shipped] ");
@@ -655,7 +669,7 @@ cat >$1/modules_new.cpp <<EOT
     o->required = false;
     o->disabled = false;
     o = new qc_qtsingleapplication(conf);
-    o->required = false;
+    o->required = true;
     o->disabled = false;
 
 EOT
@@ -1602,13 +1616,14 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
+export QC_ENABLE_DEBUG
 export QC_DISABLE_GUI
+export QC_ENABLE_DEBUG
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBBOOST_LIB
 export QC_DISABLE_libnotify
 export QC_DISABLE_geoip_database
 export QC_WITH_GEOIP_DATABASE_EMBEDDED
-export QC_DISABLE_qtsingleapplication
 export QC_WITH_QTSINGLEAPPLICATION
 export QC_VERBOSE
 rm -rf .qconftemp

install.os2

@@ -0,0 +1,136 @@
+QBittorrent installation
+
+
+
+0. CONTENTS OF THIS FILE
+========================
+
+1. INTRODUCTION
+
+2. REQUIREMENTS
+
+3. INSTALLATION
+
+4. CONTACT
+
+5. CREDITS
+
+6. SUPPORT AND DONATIONS
+
+7. HISTORY
+
+
+1. INTRODUCTION
+===============
+
+Welcome to QBittorrent port for OS/2 and eComStation.
+
+
+2. REQUIREMENTS
+===============
+
+* klibc 0.6.3 or later
+
+    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
+
+* openssl 1.0
+ 
+    ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
+
+* Qt4 dll
+
+    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
+
+
+3. INSTALLATION
+===============
+          
+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.
+  4. Start QBittorrent
+  5. Happy torrenting
+  
+
+
+4. CONTACT
+==========
+
+Please send bugreports to:
+
+  ecs@aroa.ch
+
+Only bug reports with a reproducable 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
+==========
+
+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
+

macxconf.pri

@@ -0,0 +1,16 @@
+PREFIX = /usr/local
+BINDIR = /usr/local/bin
+DATADIR = /usr/local/share
+
+INCLUDEPATH += /usr/local/include/libtorrent /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
+LIBS += -ltorrent-rasterbar -lcrypto -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -framework Cocoa -framework Carbon
+
+document_icon.path = Contents/Resources
+document_icon.files = Icons/qBitTorrentDocument.icns
+
+QMAKE_BUNDLE_DATA += document_icon
+ICON = Icons/qbittorrent_mac.icns
+QMAKE_INFO_PLIST = Info.plist
+
+DEFINES += WITH_GEOIP_EMBEDDED
+message("On Mac OS X, GeoIP database must be embedded.")

os2conf.pri

@@ -0,0 +1,17 @@
+INCLUDEPATH += $$PWD
+
+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
+
+RC_FILE = qbittorrent_os2.rc
+
+DEFINES += WITH_GEOIP_EMBEDDED
+message("On eCS(OS/2), GeoIP database must be embedded.")

qBittorrent.kdevelop

@@ -1,199 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Christophe Dumez</author>
-    <email>chris@qbittorrent.org</email>
-    <version>1.0.0</version>
-    <projectmanagement>KDevTrollProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>Qt</keyword>
-    </keywords>
-    <projectname>qBittorrent</projectname>
-    <ignoreparts/>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <defaultencoding/>
-    <versioncontrol>kdevsubversion</versioncontrol>
-  </general>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*" name="Others" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <showvcsfields>false</showvcsfields>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>w3c-svg</toc>
-      <toc>sw</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevcppsupport>
-    <qt>
-      <version>4</version>
-      <used>true</used>
-      <includestyle>4</includestyle>
-      <designerintegration>ExternalDesigner</designerintegration>
-      <root>/usr/lib/qt4</root>
-      <qmake>/usr/bin/qmake</qmake>
-      <designer>/usr/bin/designer</designer>
-      <designerpluginpaths/>
-    </qt>
-    <references>
-      <pcs>automatic_%2Fhome%2Fishanarora%2Fprojects%2Fqbittorrent</pcs>
-    </references>
-    <codecompletion>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
-      <completionBoxItemOrder>0</completionBoxItemOrder>
-      <howEvaluationContextMenu>true</howEvaluationContextMenu>
-      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
-      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
-      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
-      <processPrimaryTypes>true</processPrimaryTypes>
-      <processFunctionArguments>true</processFunctionArguments>
-      <preProcessAllHeaders>true</preProcessAllHeaders>
-      <parseMissingHeadersExperimental>true</parseMissingHeadersExperimental>
-      <resolveIncludePathsUsingMakeExperimental>true</resolveIncludePathsUsingMakeExperimental>
-      <alwaysParseInBackground>true</alwaysParseInBackground>
-      <usePermanentCaching>true</usePermanentCaching>
-      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
-      <includePaths>.;</includePaths>
-    </codecompletion>
-    <creategettersetter>
-      <prefixGet>get</prefixGet>
-      <prefixSet>set</prefixSet>
-      <prefixVariable>m_,_</prefixVariable>
-      <parameterName>theValue</parameterName>
-      <inlineGet>true</inlineGet>
-      <inlineSet>true</inlineSet>
-    </creategettersetter>
-    <splitheadersource>
-      <enabled>false</enabled>
-      <synchronize>true</synchronize>
-      <orientation>Vertical</orientation>
-    </splitheadersource>
-  </kdevcppsupport>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevtrollproject>
-    <general>
-      <activedir>src</activedir>
-    </general>
-    <run>
-      <directoryradio>executable</directoryradio>
-      <mainprogram>/home/ishanarora/projects/qbittorrent/src/qbittorrent</mainprogram>
-      <programargs/>
-      <globaldebugarguments/>
-      <globalcwd>/home/ishanarora/projects/qbittorrent</globalcwd>
-      <useglobalprogram>true</useglobalprogram>
-      <terminal>false</terminal>
-      <autocompile>true</autocompile>
-      <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
-      <envvars/>
-    </run>
-    <make>
-      <abortonerror>true</abortonerror>
-      <runmultiplejobs>false</runmultiplejobs>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
-      <envvars/>
-    </make>
-    <qmake>
-      <savebehaviour>2</savebehaviour>
-      <replacePaths>false</replacePaths>
-      <disableDefaultOpts>true</disableDefaultOpts>
-    </qmake>
-  </kdevtrollproject>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <ctagspart>
-    <customArguments/>
-    <customTagfilePath>/home/ishanarora/projects/qbittorrent/tags</customTagfilePath>
-    <activeTagsFiles/>
-  </ctagspart>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem/>
-      <docurl/>
-      <usermanualurl/>
-    </projectdoc>
-  </kdevdocumentation>
-</kdevelop>

qbittorrent.qc

@@ -20,5 +20,6 @@
   <dep type='geoip-database'>
   </dep>
   <dep type='qtsingleapplication'>
+    <required/>
   </dep>
 </qconf>

qcm/libnotify.qcm

@@ -24,7 +24,7 @@ public:
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
-			conf->addDefine("WITH_LIBNOTIFY");
+			conf->addExtra("CONFIG += libnotify");
 			for(int n = 0; n < incs.count(); ++n)
 				conf->addIncludePath(incs[n]);
 			if(!libs.isEmpty())

qcm/qt4.qcm

@@ -1,7 +1,9 @@
 /*
 -----BEGIN QCMOD-----
 name: Qt >= 4.5
+arg: enable-debug, Enable debug mode
 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 +14,14 @@ public:
 	QString shortname() const { return "Qt 4.5"; }
 	bool exec()
 	{
+                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
-		}	
+			conf->addExtra("CONFIG += nox");
+		}
+                // Debug mode
+                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
+                  conf->addExtra("CONFIG += debug");
+                }
 		return(QT_VERSION >= 0x040500);
 	}
 };

qcm/qtsingleapplication.qcm

@@ -1,6 +1,6 @@
 /*
 -----BEGIN QCMOD-----
-name: libboost
+name: qtsingleapplication
 arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
 -----END QCMOD-----
 */
@@ -16,7 +16,7 @@ public:
                 s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
                 if(s.compare("system", Qt::CaseInsensitive) == 0) {
                   // System
-                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
+                  conf->addExtra("CONFIG += usesystemqtsingleapplication");
                   printf(" [system] ");
                 } else {
                   printf(" [shipped] ");