Skip to content
Permalink
Browse files
Merge pull request #1 from qgis/master
Forked suouce update request
  • Loading branch information
Qgis-Tr-kr committed Jun 13, 2014
2 parents c31b673 + ea0e1b1 commit 2ada1677cf91b5446e1f2efed5a5ef3e8a2c490b
Showing 1,056 changed files with 349,586 additions and 423,205 deletions.
@@ -310,11 +310,15 @@ IF (PEDANTIC)
# disable warnings
ADD_DEFINITIONS( /wd4100 ) # unused formal parameters
ADD_DEFINITIONS( /wd4127 ) # constant conditional expressions (used in Qt template classes)
ADD_DEFINITIONS( /wd4231 ) # nonstandard extension used : 'identifier' before template explicit instantiation (used in Qt template classes)
ADD_DEFINITIONS( /wd4251 ) # needs to have dll-interface to be used by clients of class (occurs in Qt template classes)
ADD_DEFINITIONS( /wd4275 ) # non dll-interface class '...' used as base for dll-interface class '...'
ADD_DEFINITIONS( /wd4505 ) # unreferenced local function has been removed (QgsRasterDataProvider::extent)
ADD_DEFINITIONS( /wd4510 ) # default constructor could not be generated (sqlite3_index_info, QMap)
ADD_DEFINITIONS( /wd4512 ) # assignment operator could not be generated (sqlite3_index_info)
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
ADD_DEFINITIONS( /wd4706 ) # assignment within conditional expression (pal)
ADD_DEFINITIONS( /wd4800 ) # 'int' : forcing value to bool 'true' or 'false' (performance warning)
ELSE (MSVC)
# add warnings via flags (not as definitions as on Mac -Wall can not be overridden per language )
SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing")
@@ -69,6 +69,7 @@ IF (SPATIALITE_FOUND)
SET(CMAKE_REQUIRED_LIBRARIES "-F/Library/Frameworks" ${CMAKE_REQUIRED_LIBRARIES})
ENDIF(APPLE)
check_library_exists("${SPATIALITE_LIBRARY}" gaiaDropTable "" SPATIALITE_VERSION_GE_4_0_0)
check_library_exists("${SPATIALITE_LIBRARY}" gaiaStatisticsInvalidate "" SPATIALITE_VERSION_G_4_1_1)

ELSE (SPATIALITE_FOUND)

@@ -4,5 +4,5 @@ usr/lib/python*/*-packages/qgis/core/*
usr/lib/python*/*-packages/qgis/gui/*
usr/lib/python*/*-packages/qgis/analysis/*
usr/lib/python*/*-packages/qgis/networkanalysis/*
#wheezy saucy#usr/lib/python*/*-packages/pyspatialite/*.py
#wheezy saucy#usr/lib/python*/*-packages/pyspatialite/*.so
#wheezy precise quantal raring saucy#usr/lib/python*/*-packages/pyspatialite/*.py
#wheezy precise quantal raring saucy#usr/lib/python*/*-packages/pyspatialite/*.so
@@ -69,7 +69,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif

ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise raring saucy"))
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise quantal raring saucy"))
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
endif

Large diffs are not rendered by default.

@@ -39,15 +39,15 @@ website:
<ul>
<li>For support we encourage you to join our <a
href="http://qgis.org/en/site/forusers/support.html#mailing-lists">mailing lists</a> for
developers.</li> </ul>
users and developers.</li> </ul>

\section index_bugs Bug Reporting
If you think you have found a bug, please report it using our <a
href="http://hub.qgis.org/projects/quantum-gis">bug tracker</a>. When reporting bugs,
please include some contact information in case we need help with replicating
your issue.

\section index_maillist Mailing Lists
\section index_ircchannel IRC channel
Some QGIS users and developers can also often be found in the
<a href="irc://irc.freenode.net/#qgis">\#qgis</a> IRC channel on irc.freenode.net.<p>

Large diffs are not rendered by default.

0 comments on commit 2ada167

Please sign in to comment.