Skip to content
Permalink
Browse files

remove another Qt 4.5 depencency

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13301 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Apr 11, 2010
1 parent c6056e6 commit a78c98aede568dcbe954c67ef3a7679ae0c5c510
Showing with 9 additions and 2 deletions.
  1. +3 −1 src/app/qgisapp.cpp
  2. +6 −1 src/providers/wms/qgswmsprovider.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
@@ -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

0 comments on commit a78c98a

Please sign in to comment.
You can’t perform that action at this time.