sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix redirected wms capabilities requests

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-03-29 14:31:36 +01:00
parent fe39578eae
commit 3e4e9e13d9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/providers/wms/qgswmscapabilities.cpp
View File

@ -1867,7 +1867,7 @@ bool QgsWmsCapabilitiesDownload::downloadCapabilities()
connect( mCapabilitiesReply, SIGNAL( downloadProgress( qint64, qint64 ) ), this, SLOT( capabilitiesReplyProgress( qint64, qint64 ) ), Qt::DirectConnection );
QEventLoop loop;
connect( mCapabilitiesReply, SIGNAL( finished() ), &loop, SLOT( quit() ) );
connect( this, SIGNAL( downloadFinished() ), &loop, SLOT( quit() ) );
loop.exec( QEventLoop::ExcludeUserInputEvents );
return mError.isEmpty();
@ -1936,5 +1936,6 @@ void QgsWmsCapabilitiesDownload::capabilitiesReplyFinished()
mCapabilitiesReply->deleteLater();
mCapabilitiesReply = 0;
}
emit downloadFinished();
}

3
src/providers/wms/qgswmscapabilities.h
View File

@ -690,6 +690,9 @@ class QgsWmsCapabilitiesDownload : public QObject
/** \brief emit a signal to be caught by qgisapp and display a msg on status bar */
void statusChanged( QString const & theStatusQString );
/** \brief emit a signal once the download is finished */
void downloadFinished();
protected slots:
void capabilitiesReplyFinished();
void capabilitiesReplyProgress( qint64, qint64 );