remove another Qt 4.5 depencency

git-svn-id: http://svn.osgeo.org/qgis/trunk@13301 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 11, 2010 · e73bf54 · e73bf54
1 parent e795414
commit e73bf54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -359,8 +359,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
     , mSplash( splash )
     , mPythonUtils( NULL )
     , mNAM( NULL )
-    , mProxyFactory( NULL )
     , mpTileScaleWidget( NULL )
+#if QT_VERSION >= 0x40500
+    , mProxyFactory( NULL )
+#endif
 #ifdef HAVE_QWT
     , mpGpsWidget( NULL )
 #endif

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -102,7 +102,11 @@ QgsWmsProvider::QgsWmsProvider( QString const &uri )
                      .arg( proxy.hostName() ).arg( proxy.port() )
                      .arg( proxy.type() )
                      .arg( proxy.user() ).arg( proxy.password() )
+#if QT_VERSION >= 0x40500
                      .arg( proxy.capabilities() )
+#else
+                     .arg( 0 )
+#endif
                    );
 
       }
@@ -682,8 +686,9 @@ void QgsWmsProvider::tileReplyFinished()
 {
   QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
 
+  bool fromCache;
 #if QT_VERSION >= 0x40500
-  bool fromCache = reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool();
+  fromCache = reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool();
   if ( fromCache )
     mCacheHits++;
   else