sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-16 00:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove another Qt 4.5 depencency

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@13301 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-04-11 20:13:00 +00:00
parent e795414e20
commit e73bf54107
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/qgisapp.cpp
View File

@ -359,8 +359,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
, mSplash( splash ) , mSplash( splash )
, mPythonUtils( NULL ) , mPythonUtils( NULL )
, mNAM( NULL ) , mNAM( NULL )
, mProxyFactory( NULL )
, mpTileScaleWidget( NULL ) , mpTileScaleWidget( NULL )
#if QT_VERSION >= 0x40500
, mProxyFactory( NULL )
#endif
#ifdef HAVE_QWT #ifdef HAVE_QWT
, mpGpsWidget( NULL ) , mpGpsWidget( NULL )
#endif #endif

7
src/providers/wms/qgswmsprovider.cpp
View File

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