Skip to content

Commit c884e15

Browse files
committedJun 15, 2014
Merge pull request #2 from qgis/master
Forked source update request
2 parents 637dca7 + 6c21262 commit c884e15

File tree

124 files changed

+1851
-1795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+1851
-1795
lines changed
 

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ IF (PEDANTIC)
311311
ADD_DEFINITIONS( /wd4100 ) # unused formal parameters
312312
ADD_DEFINITIONS( /wd4127 ) # constant conditional expressions (used in Qt template classes)
313313
ADD_DEFINITIONS( /wd4231 ) # nonstandard extension used : 'identifier' before template explicit instantiation (used in Qt template classes)
314+
ADD_DEFINITIONS( /wd4244 ) # conversion from '...' to '...' possible loss of data
314315
ADD_DEFINITIONS( /wd4251 ) # needs to have dll-interface to be used by clients of class (occurs in Qt template classes)
315316
ADD_DEFINITIONS( /wd4275 ) # non dll-interface class '...' used as base for dll-interface class '...'
316317
ADD_DEFINITIONS( /wd4505 ) # unreferenced local function has been removed (QgsRasterDataProvider::extent)

‎doc/TRANSLATORS

Lines changed: 58 additions & 58 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)