From eabda8ee755dbfa40afa6596df3f38ca3c2eeae1 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sat, 1 Jan 2011 17:16:37 +0000
Subject: [PATCH] Clean up project file

---
 src/src.pro  | 43 ++++++++++++++++++-------------------------
 unixconf.pri |  3 +++
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/src.pro b/src/src.pro
index ef31b1f24..d44ddf020 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -2,15 +2,28 @@
 TEMPLATE = app
 CONFIG += qt thread
 
+# Windows specific configuration
+win32 {
+  include(../winconf.pri)
+}
+
+# Mac specific configuration
+macx {
+  include(../macxconf.pri)
+}
+
+# Unix specific configuration
 unix:!macx {
-  exists(../conf.pri) {
-    # generated by configure
-    include(../conf.pri)
-  }
+  include(../unixconf.pri)
+}
+
+# eCS(OS/2) specific configuration
+os2 {
+  include(../os2conf.pri)
 }
 
 nox {
-  QT = core
+  QT -= gui
   TARGET = qbittorrent-nox
   DEFINES += DISABLE_GUI
 } else {
@@ -35,26 +48,6 @@ CONFIG(release, debug|release):message(Project is built in RELEASE mode.)
 # VERSION DEFINES
 include(../version.pri)
 
-# Windows specific configuration
-win32 {
-  include(../winconf.pri)
-}
-
-# Mac specific configuration
-macx {
-  include(../macxconf.pri)
-}
-
-# Unix specific configuration
-unix:!macx {
-  include(../unixconf.pri)
-}
-
-# eCS(OS/2) specific configuration
-os2 {
-  include(../os2conf.pri)
-}
-
 DEFINES += QT_NO_CAST_TO_ASCII
 # Fast concatenation (Qt >= 4.6)
 DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
diff --git a/unixconf.pri b/unixconf.pri
index 184d5204c..abc5e1f49 100644
--- a/unixconf.pri
+++ b/unixconf.pri
@@ -1,3 +1,6 @@
+# Generated by the configure file
+include(../conf.pri)
+
 # COMPILATION SPECIFIC
 QT += dbus
 QMAKE_LFLAGS_APP += -rdynamic