Skip to content

Commit

Permalink
fix link error in mapserver with internal spatialite & some warnings
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@14774 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 26, 2010
1 parent d3338bb commit 853c1ae
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/app/qgsnewspatialitelayerdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions src/mapserver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/offline_editing/offline_editing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spit/qgsspitbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 2 additions & 3 deletions src/providers/wms/qgswmsprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 853c1ae

Please sign in to comment.