From d36fc22c328c63402abc002cf7591cbd4017857a Mon Sep 17 00:00:00 2001
From: jef <jef@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Fri, 26 Nov 2010 22:10:20 +0000
Subject: [PATCH] fix link error in mapserver with internal spatialite & some
 warnings

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14774 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/app/qgsnewspatialitelayerdialog.cpp         | 2 +-
 src/mapserver/CMakeLists.txt                    | 4 ++++
 src/plugins/offline_editing/offline_editing.cpp | 2 +-
 src/plugins/spit/qgsspitbase.ui                 | 2 +-
 src/providers/wms/qgswmsprovider.cpp            | 5 ++---
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/qgsnewspatialitelayerdialog.cpp b/src/app/qgsnewspatialitelayerdialog.cpp
index 034bdf65f035..c1380f5e2946 100644
--- a/src/app/qgsnewspatialitelayerdialog.cpp
+++ b/src/app/qgsnewspatialitelayerdialog.cpp
@@ -193,7 +193,7 @@ void QgsNewSpatialiteLayerDialog::initializeSpatialMetadata( sqlite3 *sqlite_han
   int ret;
   char sql[1024];
   char *errMsg = NULL;
-  int count;
+  int count = 0;
   int i;
   char **results;
   int rows;
diff --git a/src/mapserver/CMakeLists.txt b/src/mapserver/CMakeLists.txt
index ec9056755216..eb8053692316 100644
--- a/src/mapserver/CMakeLists.txt
+++ b/src/mapserver/CMakeLists.txt
@@ -101,6 +101,10 @@ INCLUDE_DIRECTORIES(
      .
 )
 
+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
diff --git a/src/plugins/offline_editing/offline_editing.cpp b/src/plugins/offline_editing/offline_editing.cpp
index f90ea812705d..a51aa616b2e9 100644
--- a/src/plugins/offline_editing/offline_editing.cpp
+++ b/src/plugins/offline_editing/offline_editing.cpp
@@ -259,7 +259,7 @@ void QgsOfflineEditing::initializeSpatialMetadata( sqlite3 *sqlite_handle )
   int ret;
   char sql[1024];
   char *errMsg = NULL;
-  int count;
+  int count = 0;
   int i;
   char **results;
   int rows;
diff --git a/src/plugins/spit/qgsspitbase.ui b/src/plugins/spit/qgsspitbase.ui
index 3efb9be638ce..5174b1af9ac5 100644
--- a/src/plugins/spit/qgsspitbase.ui
+++ b/src/plugins/spit/qgsspitbase.ui
@@ -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">
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
index 0d107d7cadbc..fdc3c4106c17 100644
--- a/src/providers/wms/qgswmsprovider.cpp
+++ b/src/providers/wms/qgswmsprovider.cpp
@@ -680,9 +680,8 @@ void QgsWmsProvider::tileReplyFinished()
 {
   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