[QGIS Commit] r13301 - in trunk/qgis/src: app providers/wms

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-04-11 16:13:00 -0400 (Sun, 11 Apr 2010)
New Revision: 13301

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
remove another Qt 4.5 depencency

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-04-11 15:02:09 UTC (rev 13300)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-04-11 20:13:00 UTC (rev 13301)
@@ -359,8 +359,10 @@
     , mSplash( splash )
     , mPythonUtils( NULL )
     , mNAM( NULL )
+    , mpTileScaleWidget( NULL )
+#if QT_VERSION >= 0x40500
     , mProxyFactory( NULL )
-    , mpTileScaleWidget( NULL )
+#endif
 #ifdef HAVE_QWT
     , mpGpsWidget( NULL )
 #endif

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-04-11 15:02:09 UTC (rev 13300)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-04-11 20:13:00 UTC (rev 13301)
@@ -102,7 +102,11 @@
                      .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 @@
 {
   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