[QGIS Commit] r14774 - in trunk/qgis/src: app mapserver plugins/offline_editing plugins/spit providers/wms

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-11-26 14:10:20 -0800 (Fri, 26 Nov 2010)
New Revision: 14774

Modified:
   trunk/qgis/src/app/qgsnewspatialitelayerdialog.cpp
   trunk/qgis/src/mapserver/CMakeLists.txt
   trunk/qgis/src/plugins/offline_editing/offline_editing.cpp
   trunk/qgis/src/plugins/spit/qgsspitbase.ui
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
fix link error in mapserver with internal spatialite & some warnings

Modified: trunk/qgis/src/app/qgsnewspatialitelayerdialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsnewspatialitelayerdialog.cpp	2010-11-26 22:10:09 UTC (rev 14773)
+++ trunk/qgis/src/app/qgsnewspatialitelayerdialog.cpp	2010-11-26 22:10:20 UTC (rev 14774)
@@ -193,7 +193,7 @@
   int ret;
   char sql[1024];
   char *errMsg = NULL;
-  int count;
+  int count = 0;
   int i;
   char **results;
   int rows;

Modified: trunk/qgis/src/mapserver/CMakeLists.txt
===================================================================
--- trunk/qgis/src/mapserver/CMakeLists.txt	2010-11-26 22:10:09 UTC (rev 14773)
+++ trunk/qgis/src/mapserver/CMakeLists.txt	2010-11-26 22:10:20 UTC (rev 14774)
@@ -101,6 +101,10 @@
      .
 )
 
+IF (WITH_INTERNAL_SPATIALITE)
+  INCLUDE_DIRECTORIES(BEFORE ../core/spatialite/headers/spatialite)
+ENDIF (WITH_INTERNAL_SPATIALITE)
+
 TARGET_LINK_LIBRARIES(qgis_mapserv.fcgi
   qgis_core 
   qgis_analysis

Modified: trunk/qgis/src/plugins/offline_editing/offline_editing.cpp
===================================================================
--- trunk/qgis/src/plugins/offline_editing/offline_editing.cpp	2010-11-26 22:10:09 UTC (rev 14773)
+++ trunk/qgis/src/plugins/offline_editing/offline_editing.cpp	2010-11-26 22:10:20 UTC (rev 14774)
@@ -259,7 +259,7 @@
   int ret;
   char sql[1024];
   char *errMsg = NULL;
-  int count;
+  int count = 0;
   int i;
   char **results;
   int rows;

Modified: trunk/qgis/src/plugins/spit/qgsspitbase.ui
===================================================================
--- trunk/qgis/src/plugins/spit/qgsspitbase.ui	2010-11-26 22:10:09 UTC (rev 14773)
+++ trunk/qgis/src/plugins/spit/qgsspitbase.ui	2010-11-26 22:10:20 UTC (rev 14774)
@@ -121,7 +121,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout" name="gridLayout_1">
         <item row="0" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-11-26 22:10:09 UTC (rev 14773)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-11-26 22:10:20 UTC (rev 14774)
@@ -680,9 +680,8 @@
 {
   QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
 
-  bool fromCache;
-#if QT_VERSION >= 0x40500
-  fromCache = reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool();
+#if defined(QGISDEBUG) && (QT_VERSION >= 0x40500)
+  bool fromCache = reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool();
   if ( fromCache )
     mCacheHits++;
   else