Fix for WMS servers running on other than port 80 (needs testing with…

… more servers). Fix for build error in grass plugin. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9537 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 24, 2008 · 8f4ac33 · 8f4ac33
1 parent f74b6b0
commit 8f4ac33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/core/qgshttptransaction.cpp b/src/core/qgshttptransaction.cpp
@@ -113,8 +113,11 @@ bool QgsHttpTransaction::getSynchronously( QByteArray &respondedContent, int red
   // includes the scheme, host and port (the
   // http://www.address.bit:80), so remove that from the url before
   // executing an http GET.
-  QString pathAndQuery = httpurl.remove( 0,
-                                         httpurl.indexOf( qurl.path() ) );
+  // 
+  // gsherman 2008-10-24 - Not sure if the above still holds true. Commenting
+  // out the removal for testing purposes
+  QString pathAndQuery = httpurl;//.remove( 0,
+                                  //       httpurl.indexOf( qurl.path() ) );
 
 
   if ( !postData ) //do request with HTTP GET

diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -114,6 +114,7 @@ TARGET_LINK_LIBRARIES(grassplugin
   qgis_core
   qgis_gui
   qgisgrass
+  ${QT_QTSQL_LIBRARY}
   ${QT_QT3SUPPORT_LIBRARY} 
   ${GRASS_LIBRARIES}
 )