Skip to content

Commit d36fc22

Browse files
author
jef
committed
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
1 parent c509b06 commit d36fc22

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

src/app/qgsnewspatialitelayerdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void QgsNewSpatialiteLayerDialog::initializeSpatialMetadata( sqlite3 *sqlite_han
193193
int ret;
194194
char sql[1024];
195195
char *errMsg = NULL;
196-
int count;
196+
int count = 0;
197197
int i;
198198
char **results;
199199
int rows;

src/mapserver/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ INCLUDE_DIRECTORIES(
101101
.
102102
)
103103

104+
IF (WITH_INTERNAL_SPATIALITE)
105+
INCLUDE_DIRECTORIES(BEFORE ../core/spatialite/headers/spatialite)
106+
ENDIF (WITH_INTERNAL_SPATIALITE)
107+
104108
TARGET_LINK_LIBRARIES(qgis_mapserv.fcgi
105109
qgis_core
106110
qgis_analysis

src/plugins/offline_editing/offline_editing.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ void QgsOfflineEditing::initializeSpatialMetadata( sqlite3 *sqlite_handle )
259259
int ret;
260260
char sql[1024];
261261
char *errMsg = NULL;
262-
int count;
262+
int count = 0;
263263
int i;
264264
char **results;
265265
int rows;

src/plugins/spit/qgsspitbase.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
</property>
122122
<layout class="QVBoxLayout" name="verticalLayout">
123123
<item>
124-
<layout class="QGridLayout" name="gridLayout">
124+
<layout class="QGridLayout" name="gridLayout_1">
125125
<item row="0" column="0">
126126
<widget class="QLabel" name="label_2">
127127
<property name="text">

src/providers/wms/qgswmsprovider.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,8 @@ void QgsWmsProvider::tileReplyFinished()
680680
{
681681
QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
682682

683-
bool fromCache;
684-
#if QT_VERSION >= 0x40500
685-
fromCache = reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool();
683+
#if defined(QGISDEBUG) && (QT_VERSION >= 0x40500)
684+
bool fromCache = reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ).toBool();
686685
if ( fromCache )
687686
mCacheHits++;
688687
else

0 commit comments

Comments
 (0)