From 3e5ff1f9eb06572c48d6a4bfaa3dfc8059e6379d Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Sat, 30 Nov 2013 10:52:15 +0100
Subject: [PATCH] set minimum Qt version to 4.7 and remove #ifdef code
 depending on prior versions

---
 CMakeLists.txt                                | 10 ++---
 INSTALL                                       |  8 ++--
 doc/INSTALL.html                              | 12 +++---
 doc/overview.t2t                              |  2 +-
 src/app/composer/qgscomposer.cpp              |  4 --
 src/app/composer/qgscomposerlabelwidget.cpp   |  2 +-
 src/app/composer/qgscomposerlegendwidget.cpp  |  8 ++--
 src/app/composer/qgscomposermapwidget.cpp     |  2 +-
 .../composer/qgscomposerscalebarwidget.cpp    |  2 +-
 src/app/composer/qgscomposertablewidget.cpp   |  4 +-
 src/app/legend/qgslegendlayer.cpp             |  7 +---
 src/app/qgisapp.cpp                           |  3 --
 src/app/qgsdecorationgriddialog.cpp           |  2 +-
 src/app/qgslabeldialog.cpp                    |  2 +-
 src/app/qgsoptions.cpp                        | 10 -----
 src/core/composer/qgscomposermap.cpp          | 37 -------------------
 src/core/qgsnetworkaccessmanager.cpp          |  6 ---
 src/core/qgsnetworkaccessmanager.h            |  4 --
 src/core/qgspaintenginehack.cpp               |  2 -
 .../qgsgraduatedsymbolrendererv2.cpp          |  4 --
 .../qgsgraduatedsymbolrendererv2.h            |  4 --
 src/gui/qgscolorbutton.cpp                    |  4 --
 src/gui/qgsexpressionbuilderwidget.cpp        |  2 -
 src/gui/qgsrelationadddlg.cpp                 |  4 --
 .../qgspointdisplacementrendererwidget.cpp    |  2 +-
 .../symbology-ng/qgsstylev2managerdialog.cpp  |  6 ---
 .../qgsvectorgradientcolorrampv2dialog.cpp    | 20 ----------
 src/providers/wcs/qgswcscapabilities.cpp      |  3 --
 src/providers/wcs/qgswcsprovider.cpp          |  5 ---
 src/providers/wms/qgswmsprovider.cpp          | 24 +-----------
 30 files changed, 30 insertions(+), 175 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36cc0b477c7..ff103cc4142 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,7 +219,7 @@ SET (HAVE_MSSQL TRUE)
 
 #############################################################
 # search for Qt4
-SET(QT_MIN_VERSION 4.5.0)
+SET(QT_MIN_VERSION 4.7.0)
 FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} REQUIRED)
 MESSAGE(STATUS "Found Qt version: ${QTVERSION}")
 SET(QT_USE_QTXML 1)
@@ -242,12 +242,8 @@ ELSE (ANDROID)
   SET (DEFAULT_WITH_TOUCH FALSE)
 ENDIF (ANDROID)
 
-#Add a touch mode if Qt has Qt Gestures (starting from 4.6)
-IF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
-  SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
-ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
-  SET (WITH_TOUCH FALSE)
-ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
+#Add a touch mode if Qt has Qt Gestures
+SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
 
 IF (WITH_TOUCH)
   # following variable is used in qgsconfig.h
diff --git a/INSTALL b/INSTALL
index a15cba528f6..7038893cdee 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Thursday November 21, 2013
+Saturday November 30, 2013
 
 
-Last Updated: Thursday November 21, 2013
-Last Change : Thursday November 21, 2013
+Last Updated: Saturday November 30, 2013
+Last Change : Saturday November 30, 2013
 
 
   1. Introduction
@@ -98,7 +98,7 @@ Required build tools:
 
 Required build deps:
 
-- Qt >= 4.5.0
+- Qt >= 4.7.0
 - Proj >= 4.4.x
 - GEOS >= 3.0
 - Sqlite3 >= 3.0.0
diff --git a/doc/INSTALL.html b/doc/INSTALL.html
index 117cf58abf3..956faea6302 100644
--- a/doc/INSTALL.html
+++ b/doc/INSTALL.html
@@ -5,7 +5,7 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <TITLE>QGIS</TITLE>
 
-<!-- Included /home/fischer/src/qgis/doc/style.css -->
+<!-- Included /home/fischer/src/qgis/qgis/doc/style.css -->
 <STYLE TYPE="text/css">
 body{  background: white;
   color: black;
@@ -77,13 +77,13 @@ label{  background-color: #FFFFCC;
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Thursday November 21, 2013</H3>
+<H3>Saturday November 30, 2013</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Thursday November 21, 2013
-Last Change : Thursday November 21, 2013
+Last Updated: Saturday November 30, 2013
+Last Change : Saturday November 30, 2013
 </P>
 <DIV CLASS="toc">
 
@@ -205,7 +205,7 @@ Required build deps:
 </P>
 
 <UL>
-<LI>Qt &gt;= 4.5.0
+<LI>Qt &gt;= 4.7.0
 <LI>Proj &gt;= 4.4.x
 <LI>GEOS &gt;= 3.0
 <LI>Sqlite3 &gt;= 3.0.0
@@ -3227,5 +3227,5 @@ The following people have contributed to this document:
 
 </DIV>
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
-<!-- cmdline: txt2tags -o/home/fischer/src/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
+<!-- cmdline: txt2tags -o/home/fischer/src/qgis/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/qgis/doc/INSTALL.t2t -->
 </BODY></HTML>
diff --git a/doc/overview.t2t b/doc/overview.t2t
index f4ab348b6a0..c168a331e66 100644
--- a/doc/overview.t2t
+++ b/doc/overview.t2t
@@ -15,7 +15,7 @@ Required build tools:
 
 Required build deps:
 
-- Qt >= 4.5.0
+- Qt >= 4.7.0
 - Proj >= 4.4.x
 - GEOS >= 3.0
 - Sqlite3 >= 3.0.0
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index 340986fdeee..5e2d5413393 100644
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@@ -1509,9 +1509,7 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
     for ( int i = 0; i < mComposition->numPages(); ++i )
     {
       QSvgGenerator generator;
-#if QT_VERSION >= 0x040500
       generator.setTitle( QgsProject::instance()->title() );
-#endif
       if ( i == 0 )
       {
         generator.setFileName( outputFileName );
@@ -1527,9 +1525,7 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
       //height in pixel
       int height = ( int )( mComposition->paperHeight() * mComposition->printResolution() / 25.4 );
       generator.setSize( QSize( width, height ) );
-#if QT_VERSION >= 0x040500
       generator.setViewBox( QRect( 0, 0, width, height ) );
-#endif
       generator.setResolution( mComposition->printResolution() ); //because the rendering is done in mm, convert the dpi
 
       QPainter p( &generator );
diff --git a/src/app/composer/qgscomposerlabelwidget.cpp b/src/app/composer/qgscomposerlabelwidget.cpp
index 2175e566c7c..d658cd51a45 100644
--- a/src/app/composer/qgscomposerlabelwidget.cpp
+++ b/src/app/composer/qgscomposerlabelwidget.cpp
@@ -86,7 +86,7 @@ void QgsComposerLabelWidget::on_mFontButton_clicked()
   if ( mComposerLabel )
   {
     bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
     // Native Mac dialog works only for Qt Carbon
     QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font(), 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
index 814e70ba765..dad3fe434a8 100644
--- a/src/app/composer/qgscomposerlegendwidget.cpp
+++ b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -373,7 +373,7 @@ void QgsComposerLegendWidget::on_mTitleFontButton_clicked()
   if ( mLegend )
   {
     bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
     // Native Mac dialog works only for Qt Carbon
     QFont newFont = QFontDialog::getFont( &ok, mLegend->style( QgsComposerLegendStyle::Title ).font(), 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
@@ -395,7 +395,7 @@ void QgsComposerLegendWidget::on_mGroupFontButton_clicked()
   if ( mLegend )
   {
     bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
     // Native Mac dialog works only for Qt Carbon
     QFont newFont = QFontDialog::getFont( &ok, mLegend->style( QgsComposerLegendStyle::Group ).font(), 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
@@ -417,7 +417,7 @@ void QgsComposerLegendWidget::on_mLayerFontButton_clicked()
   if ( mLegend )
   {
     bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
     // Native Mac dialog works only for Qt Carbon
     QFont newFont = QFontDialog::getFont( &ok, mLegend->style( QgsComposerLegendStyle::Subgroup ).font(), 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
@@ -439,7 +439,7 @@ void QgsComposerLegendWidget::on_mItemFontButton_clicked()
   if ( mLegend )
   {
     bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
     // Native Mac dialog works only for Qt Carbon
     QFont newFont = QFontDialog::getFont( &ok, mLegend->style( QgsComposerLegendStyle::SymbolLabel ).font(), 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
index 57b2e33c10a..fdb754a37be 100644
--- a/src/app/composer/qgscomposermapwidget.cpp
+++ b/src/app/composer/qgscomposermapwidget.cpp
@@ -751,7 +751,7 @@ void QgsComposerMapWidget::on_mAnnotationFontButton_clicked()
   }
 
   bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
   // Native Mac dialog works only for Qt Carbon
   QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont(), 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp
index 76ee4aae030..73868e4261a 100644
--- a/src/app/composer/qgscomposerscalebarwidget.cpp
+++ b/src/app/composer/qgscomposerscalebarwidget.cpp
@@ -282,7 +282,7 @@ void QgsComposerScaleBarWidget::on_mFontButton_clicked()
 
   bool dialogAccepted;
   QFont oldFont = mComposerScaleBar->font();
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
   // Native Mac dialog works only for Qt Carbon
   QFont newFont = QFontDialog::getFont( &dialogAccepted, oldFont, 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
diff --git a/src/app/composer/qgscomposertablewidget.cpp b/src/app/composer/qgscomposertablewidget.cpp
index aa993778043..93ebbb908aa 100644
--- a/src/app/composer/qgscomposertablewidget.cpp
+++ b/src/app/composer/qgscomposertablewidget.cpp
@@ -217,7 +217,7 @@ void QgsComposerTableWidget::on_mHeaderFontPushButton_clicked()
   }
 
   bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
   // Native Mac dialog works only for Qt Carbon
   QFont newFont = QFontDialog::getFont( &ok, mComposerTable->headerFont(), 0, tr( "Select Font" ), QFontDialog::DontUseNativeDialog );
 #else
@@ -239,7 +239,7 @@ void QgsComposerTableWidget::on_mContentFontPushButton_clicked()
   }
 
   bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
   // Native Mac dialog works only for Qt Carbon
   QFont newFont = QFontDialog::getFont( &ok, mComposerTable->contentFont(), 0, tr( "Select Font" ), QFontDialog::DontUseNativeDialog );
 #else
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
index b25fb38753c..71fdde56002 100644
--- a/src/app/legend/qgslegendlayer.cpp
+++ b/src/app/legend/qgslegendlayer.cpp
@@ -215,9 +215,7 @@ void QgsLegendLayer::rasterLayerSymbology( QgsRasterLayer* layer )
   SymbologyList itemList;
   QList< QPair< QString, QColor > > rasterItemList = layer->legendSymbologyItems();
   QList< QPair< QString, QColor > >::const_iterator itemIt = rasterItemList.constBegin();
-#if QT_VERSION >= 0x40700
   itemList.reserve( rasterItemList.size() );
-#endif
 
   // GetLegendGraphics in case of WMS service... pixmap can return null if GetLegendGraphics
   // is not supported by the server
@@ -231,9 +229,8 @@ void QgsLegendLayer::rasterLayerSymbology( QgsRasterLayer* layer )
     {
       QgsDebugMsg( QString( "downloaded legend with dimension width:" ) + QString::number( legendGraphic.width() ) + QString( " and Height:" ) + QString::number( legendGraphic.height() ) );
 
-#if QT_VERSION >= 0x40700
-      if ( rasterItemList.size() == 0 ) itemList.reserve( 1 );
-#endif
+      if ( rasterItemList.size() == 0 )
+        itemList.reserve( 1 );
       itemList.append( qMakePair( QString( "" ), QPixmap::fromImage( legendGraphic ) ) );
     }
   }
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 74f27a94c9b..90eef601160 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -74,10 +74,7 @@
 #include <QNetworkReply>
 #include <QNetworkProxy>
 #include <QAuthenticator>
-
-#if QT_VERSION >= 0x40500
 #include <QNetworkDiskCache>
-#endif
 
 //
 // Mac OS X Includes
diff --git a/src/app/qgsdecorationgriddialog.cpp b/src/app/qgsdecorationgriddialog.cpp
index 2c678daf0d1..ceb8ce5468b 100644
--- a/src/app/qgsdecorationgriddialog.cpp
+++ b/src/app/qgsdecorationgriddialog.cpp
@@ -275,7 +275,7 @@ void QgsDecorationGridDialog::on_mPbtnUpdateFromLayer_clicked()
 void QgsDecorationGridDialog::on_mAnnotationFontButton_clicked()
 {
   bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
   // Native Mac dialog works only for Qt Carbon
   QFont newFont = QFontDialog::getFont( &ok, mDeco.gridAnnotationFont(), 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
diff --git a/src/app/qgslabeldialog.cpp b/src/app/qgslabeldialog.cpp
index 76751e247b8..0d2e118975d 100644
--- a/src/app/qgslabeldialog.cpp
+++ b/src/app/qgslabeldialog.cpp
@@ -280,7 +280,7 @@ void QgsLabelDialog::changeFont( void )
 
   qreal fontSize = mFont.pointSizeF();
   bool resultFlag;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
   // Native Mac dialog works only for Qt Carbon
   mFont = QFontDialog::getFont( &resultFlag, mFont, 0, QString(), QFontDialog::DontUseNativeDialog );
 #else
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
index a144a2e0762..28044bf2232 100644
--- a/src/app/qgsoptions.cpp
+++ b/src/app/qgsoptions.cpp
@@ -48,10 +48,7 @@
 #include <QSize>
 #include <QStyleFactory>
 #include <QMessageBox>
-
-#if QT_VERSION >= 0x40500
 #include <QNetworkDiskCache>
-#endif
 
 #include <limits>
 #include <sqlite3.h>
@@ -286,7 +283,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
     }
   }
 
-#if QT_VERSION >= 0x40500
   // cache settings
   QNetworkDiskCache *cache = qobject_cast<QNetworkDiskCache*>( QgsNetworkAccessManager::instance()->cache() );
   if ( cache )
@@ -298,10 +294,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
     QgsDebugMsg( QString( "set cacheSize: %1" ).arg( cache->maximumCacheSize() ) );
     mCacheSize->setValue( cache->maximumCacheSize() / 1024 );
   }
-#else
-  grpUrlExclude->setHidden( true );
-  grpCache->setHidden( true );
-#endif
 
   //wms search server
   leWmsSearch->setText( settings.value( "/qgis/WMSSearchUrl", "http://geopole.org/wms/search?search=%1&type=rss" ).toString() );
@@ -1700,9 +1692,7 @@ void QgsOptions::on_mBrowseCacheDirectory_clicked()
 
 void QgsOptions::on_mClearCache_clicked()
 {
-#if QT_VERSION >= 0x40500
   QgsNetworkAccessManager::instance()->cache()->clear();
-#endif
 }
 
 void QgsOptions::on_mOptionsStackedWidget_currentChanged( int theIndx )
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
index dbf14cc7a41..8c33e061139 100644
--- a/src/core/composer/qgscomposermap.cpp
+++ b/src/core/composer/qgscomposermap.cpp
@@ -1974,7 +1974,6 @@ void QgsComposerMap::drawCanvasItems( QPainter* painter, const QStyleOptionGraph
   }
   QGraphicsItem* currentItem = 0;
 
-#if QT_VERSION >= 0x40600 //Qt 4.6 provides the items in visibility order
   for ( int i = itemList.size() - 1; i >= 0; --i )
   {
     currentItem = itemList.at( i );
@@ -1985,42 +1984,6 @@ void QgsComposerMap::drawCanvasItems( QPainter* painter, const QStyleOptionGraph
     }
     drawCanvasItem( currentItem, painter, itemStyle );
   }
-#else //Qt <4.6 provides the items in random order
-  QMultiMap<int, QGraphicsItem*> topLevelItems;
-  QMultiMap<QGraphicsItem*, QGraphicsItem*> childItems; //QMultiMap<parentItem, childItem>
-
-  for ( int i = 0; i < itemList.size(); ++i )
-  {
-    currentItem = itemList.at( i );
-    //don't draw mapcanvasmap (has z value -10)
-    if ( !currentItem || currentItem->data( 0 ) != "AnnotationItem" )
-    {
-      continue;
-    }
-    if ( currentItem->parentItem() )
-    {
-      childItems.insert( currentItem->parentItem(), currentItem );
-    }
-    else
-    {
-      topLevelItems.insert( currentItem->zValue(), currentItem );
-    }
-  }
-
-  QMultiMap<int, QGraphicsItem*>::iterator topLevelIt = topLevelItems.begin();
-  for ( ; topLevelIt != topLevelItems.end(); ++topLevelIt )
-  {
-    drawCanvasItem( topLevelIt.value(), painter, itemStyle );
-    //Draw children. They probably should be sorted according to z-order, but we don't do it because this code is only
-    //there for backward compatibility. And currently, having several embedded children is not used in QGIS
-    QMap<QGraphicsItem*, QGraphicsItem*>::iterator childIt = childItems.find( topLevelIt.value() );
-    while ( childIt != childItems.end() && childIt.key() == topLevelIt.value() )
-    {
-      drawCanvasItem( childIt.value(), painter, itemStyle );
-      ++childIt;
-    }
-  }
-#endif
 }
 
 void QgsComposerMap::drawCanvasItem( QGraphicsItem* item, QPainter* painter, const QStyleOptionGraphicsItem* itemStyle )
diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
index e64ba1f6d75..3ae94e202c3 100644
--- a/src/core/qgsnetworkaccessmanager.cpp
+++ b/src/core/qgsnetworkaccessmanager.cpp
@@ -28,7 +28,6 @@
 #include <QTimer>
 #include <QNetworkReply>
 
-#if QT_VERSION >= 0x40500
 class QgsNetworkProxyFactory : public QNetworkProxyFactory
 {
   public:
@@ -70,7 +69,6 @@ class QgsNetworkProxyFactory : public QNetworkProxyFactory
       return QList<QNetworkProxy>() << nam->fallbackProxy();
     }
 };
-#endif
 
 QgsNetworkAccessManager *QgsNetworkAccessManager::instance()
 {
@@ -82,16 +80,13 @@ QgsNetworkAccessManager *QgsNetworkAccessManager::instance()
 QgsNetworkAccessManager::QgsNetworkAccessManager( QObject *parent )
     : QNetworkAccessManager( parent )
 {
-#if QT_VERSION >= 0x40500
   setProxyFactory( new QgsNetworkProxyFactory() );
-#endif
 }
 
 QgsNetworkAccessManager::~QgsNetworkAccessManager()
 {
 }
 
-#if QT_VERSION >= 0x40500
 void QgsNetworkAccessManager::insertProxyFactory( QNetworkProxyFactory *factory )
 {
   mProxyFactories.insert( 0, factory );
@@ -106,7 +101,6 @@ const QList<QNetworkProxyFactory *> QgsNetworkAccessManager::proxyFactories() co
 {
   return mProxyFactories;
 }
-#endif
 
 const QStringList &QgsNetworkAccessManager::excludeList() const
 {
diff --git a/src/core/qgsnetworkaccessmanager.h b/src/core/qgsnetworkaccessmanager.h
index 588bc0a71a2..2829f361a8f 100644
--- a/src/core/qgsnetworkaccessmanager.h
+++ b/src/core/qgsnetworkaccessmanager.h
@@ -55,7 +55,6 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
     //! destructor
     ~QgsNetworkAccessManager();
 
-#if QT_VERSION >= 0x40500
     //! insert a factory into the proxy factories list
     void insertProxyFactory( QNetworkProxyFactory *factory );
 
@@ -64,7 +63,6 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
 
     //! retrieve proxy factory list
     const QList<QNetworkProxyFactory *> proxyFactories() const;
-#endif
 
     //! retrieve fall back proxy (for urls that no factory returned proxies for)
     const QNetworkProxy &fallbackProxy() const;
@@ -95,9 +93,7 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
 
   private:
     QgsNetworkAccessManager( QObject *parent = 0 );
-#if QT_VERSION >= 0x40500
     QList<QNetworkProxyFactory*> mProxyFactories;
-#endif
     QNetworkProxy mFallbackProxy;
     QStringList mExcludedURLs;
 
diff --git a/src/core/qgspaintenginehack.cpp b/src/core/qgspaintenginehack.cpp
index 0f722edc19f..0c62612edcb 100644
--- a/src/core/qgspaintenginehack.cpp
+++ b/src/core/qgspaintenginehack.cpp
@@ -38,9 +38,7 @@ void QgsPaintEngineHack::fixFlags()
               // | QPaintEngine::PerspectiveTransform
               | QPaintEngine::BlendModes
               // | QPaintEngine::ObjectBoundingModeGradients
-#if QT_VERSION >= 0x040500
               | QPaintEngine::RasterOpModes
-#endif
               | QPaintEngine::PaintOutsidePaintEvent
             );
 }
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
index 1902ceb3a5d..10a442892b5 100644
--- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
+++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -273,11 +273,7 @@ void QgsGraduatedSymbolRendererV2::stopRender( QgsRenderContext& context )
     it->symbol()->stopRender( context );
 
   // cleanup mTempSymbols
-#if QT_VERSION < 0x40600
-  QMap<QgsSymbolV2*, QgsSymbolV2*>::iterator it2 = mTempSymbols.begin();
-#else
   QHash<QgsSymbolV2*, QgsSymbolV2*>::iterator it2 = mTempSymbols.begin();
-#endif
   for ( ; it2 != mTempSymbols.end(); ++it2 )
   {
     it2.value()->stopRender( context );
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
index 62691b387f9..721b021193e 100644
--- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
+++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
@@ -184,11 +184,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
     int mRotationFieldIdx, mSizeScaleFieldIdx;
 
     //! temporary symbols, used for data-defined rotation and scaling
-#if QT_VERSION < 0x40600
-    QMap<QgsSymbolV2*, QgsSymbolV2*> mTempSymbols;
-#else
     QHash<QgsSymbolV2*, QgsSymbolV2*> mTempSymbols;
-#endif
 
     QgsSymbolV2* symbolForValue( double value );
 };
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
index 38bc5b34c4d..855db83c7fd 100644
--- a/src/gui/qgscolorbutton.cpp
+++ b/src/gui/qgscolorbutton.cpp
@@ -70,7 +70,6 @@ void QgsColorButton::onButtonClicked()
 {
   //QgsDebugMsg( "entered" );
   QColor newColor;
-#if QT_VERSION >= 0x040500
   QSettings settings;
   if ( mAcceptLiveUpdates && settings.value( "/qgis/live_color_dialogs", false ).toBool() )
   {
@@ -82,9 +81,6 @@ void QgsColorButton::onButtonClicked()
   {
     newColor = QColorDialog::getColor( color(), this->parentWidget(), mColorDialogTitle, mColorDialogOptions );
   }
-#else
-  newColor = QColorDialog::getColor( color(), this->parentWidget() );
-#endif
   setValidColor( newColor );
 
   // reactivate button's window
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
index d47c0ed4a6c..297363a7331 100644
--- a/src/gui/qgsexpressionbuilderwidget.cpp
+++ b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -104,9 +104,7 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
     registerItem( specials[i]->group(), name, " " + name + " " );
   }
 
-#if QT_VERSION >= 0x040700
   txtSearchEdit->setPlaceholderText( tr( "Search" ) );
-#endif
 }
 
 
diff --git a/src/gui/qgsrelationadddlg.cpp b/src/gui/qgsrelationadddlg.cpp
index dea4f5113c8..70995b15afc 100644
--- a/src/gui/qgsrelationadddlg.cpp
+++ b/src/gui/qgsrelationadddlg.cpp
@@ -6,11 +6,7 @@ QgsRelationAddDlg::QgsRelationAddDlg( QWidget *parent ) :
 {
   setupUi( this );
 
-#if QT_VERSION >= 0x40700
   mTxtRelationId->setPlaceholderText( tr( "[Generated automatically]" ) );
-#else
-  mTxtRelationId->setToolTip( tr( "[Generated automatically]" ) );
-#endif
 }
 
 void QgsRelationAddDlg::addLayers( QList< QgsVectorLayer* > layers )
diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
index b8e292b3e28..6e4e78805f2 100644
--- a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
+++ b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
@@ -207,7 +207,7 @@ void QgsPointDisplacementRendererWidget::on_mLabelFontButton_clicked()
   }
 
   bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
   // Native Mac dialog works only for QT Carbon
   QFont newFont = QFontDialog::getFont( &ok, mRenderer->labelFont(), 0, tr( "Label Font" ), QFontDialog::DontUseNativeDialog );
 #else
diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
index 906d56d9194..ccbb414799a 100644
--- a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
+++ b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
@@ -54,14 +54,8 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
   mSplitter->setSizes( QList<int>() << 170 << 540 );
   mSplitter->restoreState( settings.value( "/Windows/StyleV2Manager/splitter" ).toByteArray() );
 
-#if QT_VERSION >= 0x40500
   tabItemType->setDocumentMode( true );
-#endif
-#if QT_VERSION >= 0x40700
   searchBox->setPlaceholderText( tr( "Type here to filter symbols..." ) );
-#else
-  searchBox->setToolTip( tr( "Type here to filter symbols..." ) );
-#endif
 
   // setup icons
   btnAddItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
index 718493dbd80..0af34a5e2bd 100644
--- a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
+++ b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
@@ -288,19 +288,9 @@ void QgsVectorGradientColorRampV2Dialog::stopDoubleClicked( QTreeWidgetItem* ite
     double key = item->data( 0, StopOffsetRole ).toDouble();
     // allow for floating-point values
     double val = key * 100;
-#if QT_VERSION >= 0x40500
     val = QInputDialog::getDouble( this, tr( "Offset of the stop" ),
                                    tr( "Please enter offset in percents (%) of the new stop" ),
                                    val, 0, 100, 2, &ok );
-#else
-    QString res = QInputDialog::getText( this, tr( "Offset of the stop" ),
-                                         tr( "Please enter offset in percents (%) of the new stop" ),
-                                         QLineEdit::Normal, QString::number( val ), &ok );
-    if ( ok )
-      val = res.toDouble( &ok );
-    if ( ok )
-      ok = val >= 0 && val <= 100;
-#endif
     if ( !ok )
       return;
 
@@ -330,19 +320,9 @@ void QgsVectorGradientColorRampV2Dialog::addStop()
 
   bool ok;
   double val = 50.0;
-#if QT_VERSION >= 0x40500
   val = QInputDialog::getDouble( this, tr( "Offset of the stop" ),
                                  tr( "Please enter offset in percents (%) of the new stop" ),
                                  val, 0, 100, 2, &ok );
-#else
-  QString res = QInputDialog::getText( this, tr( "Offset of the stop" ),
-                                       tr( "Please enter offset in percents (%) of the new stop" ),
-                                       QLineEdit::Normal, QString::number( val ), &ok );
-  if ( ok )
-    val = res.toDouble( &ok );
-  if ( ok )
-    ok = val >= 0 && val <= 100;
-#endif
   if ( !ok )
     return;
   activateWindow();
diff --git a/src/providers/wcs/qgswcscapabilities.cpp b/src/providers/wcs/qgswcscapabilities.cpp
index 0f06fc089bf..84d74fa5460 100644
--- a/src/providers/wcs/qgswcscapabilities.cpp
+++ b/src/providers/wcs/qgswcscapabilities.cpp
@@ -38,10 +38,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QNetworkProxy>
-
-#if QT_VERSION >= 0x40500
 #include <QNetworkDiskCache>
-#endif
 
 #include <QUrl>
 #include <QIcon>
diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp
index c116187bea5..2ef81a2797a 100644
--- a/src/providers/wcs/qgswcsprovider.cpp
+++ b/src/providers/wcs/qgswcsprovider.cpp
@@ -40,10 +40,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QNetworkProxy>
-
-#if QT_VERSION >= 0x40500
 #include <QNetworkDiskCache>
-#endif
 
 #include <QUrl>
 #include <QRegExp>
@@ -1516,12 +1513,10 @@ QString QgsWcsProvider::metadata()
   metadata += "</a>";
 
 #if 0
-#if QT_VERSION >= 0x40500
   // TODO
   metadata += "<a href=\"#cachestats\">";
   metadata += tr( "Cache Stats" );
   metadata += "</a> ";
-#endif
 #endif
 
   metadata += "</td></tr>";
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
index 88961489842..111bed0e9c0 100644
--- a/src/providers/wms/qgswmsprovider.cpp
+++ b/src/providers/wms/qgswmsprovider.cpp
@@ -47,15 +47,10 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QNetworkProxy>
-
-#if QT_VERSION >= 0x40500
 #include <QNetworkDiskCache>
-#endif
 
-#if QT_VERSION >= 0x40600
 #include <QtXmlPatterns/QXmlSchema>
 #include <QtXmlPatterns/QXmlSchemaValidator>
-#endif
 
 #include <QUrl>
 #include <QIcon>
@@ -1160,14 +1155,14 @@ void QgsWmsProvider::tileReplyFinished()
 {
   QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
 
-#if defined(QGISDEBUG) && (QT_VERSION >= 0x40500)
+#if defined(QGISDEBUG)
   bool fromCache = reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool();
   if ( fromCache )
     mCacheHits++;
   else
     mCacheMisses++;
 #endif
-#if defined(QGISDEBUG) && (QT_VERSION >= 0x40700)
+#if defined(QGISDEBUG)
   QgsDebugMsgLevel( "raw headers:", 3 );
   foreach ( const QNetworkReply::RawHeaderPair &pair, reply->rawHeaderPairs() )
   {
@@ -1206,7 +1201,6 @@ void QgsWmsProvider::tileReplyFinished()
 #ifdef QGISDEBUG
   int retry = reply->request().attribute( static_cast<QNetworkRequest::Attribute>( TileRetry ) ).toInt();
 
-#if QT_VERSION >= 0x40500
   QgsDebugMsg( QString( "tile reply %1 (%2) tile:%3(retry %4) rect:%5,%6 %7,%8) fromcache:%9 error:%10 url:%11" )
                .arg( tileReqNo ).arg( mTileReqNo ).arg( tileNo ).arg( retry )
                .arg( r.left(), 0, 'f' ).arg( r.bottom(), 0, 'f' ).arg( r.right(), 0, 'f' ).arg( r.top(), 0, 'f' )
@@ -1214,14 +1208,6 @@ void QgsWmsProvider::tileReplyFinished()
                .arg( reply->errorString() )
                .arg( reply->url().toString() )
              );
-#else
-  QgsDebugMsg( QString( "tile reply %1 (%2) tile:%3(retry %4) rect:%5,%6 %7,%8) error:%9 url:%10" )
-               .arg( tileReqNo ).arg( mTileReqNo ).arg( tileNo ).arg( retry )
-               .arg( r.left(), 0, 'f' ).arg( r.bottom(), 0, 'f' ).arg( r.right(), 0, 'f' ).arg( r.top(), 0, 'f' )
-               .arg( reply->errorString() )
-               .arg( reply->url().toString() )
-             );
-#endif
 #endif
 
   if ( reply->error() == QNetworkReply::NoError )
@@ -3729,11 +3715,9 @@ QString QgsWmsProvider::metadata()
     metadata += tr( "Tile Layer Properties" );
     metadata += "</a> ";
 
-#if QT_VERSION >= 0x40500
     metadata += "<a href=\"#cachestats\">";
     metadata += tr( "Cache Stats" );
     metadata += "</a> ";
-#endif
   }
 
   metadata += "</td></tr>";
@@ -4044,7 +4028,6 @@ QString QgsWmsProvider::metadata()
 
     metadata += "</table></td></tr>";
 
-#if QT_VERSION >= 0x40500
     if ( mTiled )
     {
       metadata += "<tr><th class=\"glossy\"><a name=\"cachestats\"></a>";
@@ -4082,7 +4065,6 @@ QString QgsWmsProvider::metadata()
 
       metadata += "</table></td></tr>";
     }
-#endif
   }
 
   metadata += "</table>";
@@ -4400,7 +4382,6 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
 
       if ( xsdPart >= 0 )  // XSD available
       {
-#if QT_VERSION >= 0x40600
 #if 0
         // Validate GML by schema
         // Loading schema takes ages! It needs to load all XSD referenced in the schema,
@@ -4430,7 +4411,6 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
           results.insert( count, tr( "GML is not valid" ) );
           continue;
         }
-#endif
 #endif
         QgsDebugMsg( "GML XSD (first 4000 bytes):\n" + QString::fromUtf8( mIdentifyResultBodies.value( xsdPart ).left( 4000 ) ) );
         gmlSchema.parseXSD( mIdentifyResultBodies.value( xsdPart ) );