Skip to content
Permalink
Browse files

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
  • Loading branch information
jef
jef committed Nov 26, 2010
1 parent c509b06 commit d36fc22c328c63402abc002cf7591cbd4017857a
@@ -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;
@@ -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
@@ -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;
@@ -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">
@@ -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

0 comments on commit d36fc22

Please sign in to comment.
You can’t perform that action at this time.