fixed compilation with Qt4.3

wonder · wonder · commit f7c86886ceda · 2009-01-26T19:09:51.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10023 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgshttptransaction.cpp b/src/core/qgshttptransaction.cpp
@@ -516,6 +516,7 @@ bool QgsHttpTransaction::applyProxySettings( QHttp& http, const QString& url )
   {
     proxyType = QNetworkProxy::HttpProxy;
   }
+#if QT_VERSION >= 0x040400
   else if ( proxyTypeString == "HttpCachingProxy" )
   {
     proxyType = QNetworkProxy::HttpCachingProxy;
@@ -524,6 +525,7 @@ bool QgsHttpTransaction::applyProxySettings( QHttp& http, const QString& url )
   {
     proxyType = QNetworkProxy::FtpCachingProxy;
   }
+#endif
   http.setProxy( QNetworkProxy( proxyType, proxyHost, proxyPort, proxyUser, proxyPassword ) );
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,7 @@ bool QgsHttpTransaction::applyProxySettings( QHttp& http, const QString& url )`
`516`	`516`	`{`
`517`	`517`	`proxyType = QNetworkProxy::HttpProxy;`
`518`	`518`	`}`
	`519`	`+#if QT_VERSION >= 0x040400`
`519`	`520`	`else if ( proxyTypeString == "HttpCachingProxy" )`
`520`	`521`	`{`
`521`	`522`	`proxyType = QNetworkProxy::HttpCachingProxy;`
`@@ -524,6 +525,7 @@ bool QgsHttpTransaction::applyProxySettings( QHttp& http, const QString& url )`
`524`	`525`	`{`
`525`	`526`	`proxyType = QNetworkProxy::FtpCachingProxy;`
`526`	`527`	`}`
	`528`	`+#endif`
`527`	`529`	`http.setProxy( QNetworkProxy( proxyType, proxyHost, proxyPort, proxyUser, proxyPassword ) );`
`528`	`530`	`return true;`
`529`	`531`	`}`