[QGIS Commit] r9537 - in trunk/qgis/src: core plugins/grass

[svn_qgis at osgeo.org]

Author: gsherman
Date: 2008-10-24 17:59:32 -0400 (Fri, 24 Oct 2008)
New Revision: 9537

Modified:
   trunk/qgis/src/core/qgshttptransaction.cpp
   trunk/qgis/src/plugins/grass/CMakeLists.txt
Log:
Fix for WMS servers running on other than port 80 (needs testing with more servers).
Fix for build error in grass plugin.


Modified: trunk/qgis/src/core/qgshttptransaction.cpp
===================================================================
--- trunk/qgis/src/core/qgshttptransaction.cpp	2008-10-24 21:47:48 UTC (rev 9536)
+++ trunk/qgis/src/core/qgshttptransaction.cpp	2008-10-24 21:59:32 UTC (rev 9537)
@@ -113,8 +113,11 @@
   // 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

Modified: trunk/qgis/src/plugins/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/grass/CMakeLists.txt	2008-10-24 21:47:48 UTC (rev 9536)
+++ trunk/qgis/src/plugins/grass/CMakeLists.txt	2008-10-24 21:59:32 UTC (rev 9537)
@@ -114,6 +114,7 @@
   qgis_core
   qgis_gui
   qgisgrass
+  ${QT_QTSQL_LIBRARY}
   ${QT_QT3SUPPORT_LIBRARY} 
   ${GRASS_LIBRARIES}
 )