From 0e81f3731fcb9024f850d7969fea838125079b50 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 3 Sep 2007 22:59:46 +0000
Subject: [PATCH] - Dropped Qt4.2 support, it becomes too difficult to maintain
 for me and Trolltech broke backward compatibility for UI files...

---
 TODO           |  1 +
 configure      | 16 ++++++++--------
 qbittorrent.qc |  2 +-
 qcm/qt4.qcm    | 16 ++++++++++++++++
 qcm/qt42.qcm   | 16 ----------------
 src/src.pro    | 17 +----------------
 6 files changed, 27 insertions(+), 41 deletions(-)
 create mode 100644 qcm/qt4.qcm
 delete mode 100644 qcm/qt42.qcm

diff --git a/TODO b/TODO
index 4e03af3b8..6fb2a175e 100644
--- a/TODO
+++ b/TODO
@@ -119,4 +119,5 @@ beta6->beta7 changelog:
 - BUGFIX: Fixed torrent create (can only one file or one folder)
 - BUGFIX: the function that set the rows color doesn't handle hidden columns anymore
 - BUGFIX: improved search engine plugin manager code and fixed bugs
+- BUGFIX: Dropped Qt4.2 support, becomes too difficult to maintain
 - COSMETIC: Improved some icons
diff --git a/configure b/configure
index 2433c9b64..707d9232d 100755
--- a/configure
+++ b/configure
@@ -340,21 +340,21 @@ fi
 
 gen_files() {
 cat >$1/modules.cpp <<EOT
-#line 1 "qt42.qcm"
+#line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.2
+name: Qt >= 4.3
 -----END QCMOD-----
 */
-class qc_qt42 : public ConfObj
+class qc_qt4 : public ConfObj
 {
 public:
-	qc_qt42(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.2"; }
-	QString shortname() const { return "qt42"; }
+	qc_qt4(Conf *c) : ConfObj(c) {}
+	QString name() const { return "Qt >= 4.3"; }
+	QString shortname() const { return "Qt 4.3"; }
 	bool exec()
 	{
-		return(QT_VERSION >= 0x040200);
+		return(QT_VERSION >= 0x040300);
 	}
 };
 #line 1 "libtorrent.qcm"
@@ -738,7 +738,7 @@ public:
 
 EOT
 cat >$1/modules_new.cpp <<EOT
-    o = new qc_qt42(conf);
+    o = new qc_qt4(conf);
     o->required = true;
     o->disabled = false;
     o = new qc_libtorrent(conf);
diff --git a/qbittorrent.qc b/qbittorrent.qc
index a4dc53d1d..93a002c39 100644
--- a/qbittorrent.qc
+++ b/qbittorrent.qc
@@ -3,7 +3,7 @@
  <profile>qbittorrent.pro</profile>
  <moddir>qcm</moddir>
  <datadir/>
-  <dep type='qt42'>
+  <dep type='qt4'>
     <required/>
   </dep>
   <dep type='libtorrent'>
diff --git a/qcm/qt4.qcm b/qcm/qt4.qcm
new file mode 100644
index 000000000..64df414ea
--- /dev/null
+++ b/qcm/qt4.qcm
@@ -0,0 +1,16 @@
+/*
+-----BEGIN QCMOD-----
+name: Qt >= 4.3
+-----END QCMOD-----
+*/
+class qc_qt4 : public ConfObj
+{
+public:
+	qc_qt4(Conf *c) : ConfObj(c) {}
+	QString name() const { return "Qt >= 4.3"; }
+	QString shortname() const { return "Qt 4.3"; }
+	bool exec()
+	{
+		return(QT_VERSION >= 0x040300);
+	}
+};
diff --git a/qcm/qt42.qcm b/qcm/qt42.qcm
deleted file mode 100644
index 77db1ab9e..000000000
--- a/qcm/qt42.qcm
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: Qt >= 4.2
------END QCMOD-----
-*/
-class qc_qt42 : public ConfObj
-{
-public:
-	qc_qt42(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.2"; }
-	QString shortname() const { return "qt42"; }
-	bool exec()
-	{
-		return(QT_VERSION >= 0x040200);
-	}
-};
diff --git a/src/src.pro b/src/src.pro
index 87f457490..7dbf36320 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -78,9 +78,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 +87,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