Skip to content

Commit 8cddfb8

Browse files
committedJul 1, 2011
Merge remote branch 'upstream/master' into expression-labels
2 parents d954421 + 4d75a7d commit 8cddfb8

File tree

422 files changed

+9892
-5356
lines changed

Some content is hidden

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

422 files changed

+9892
-5356
lines changed
 

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ IF (PEDANTIC)
213213
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
214214
ADD_DEFINITIONS( /wd4706 ) # assignment within conditional expression (pal)
215215
ELSE (MSVC)
216-
ADD_DEFINITIONS( -Wall -Wno-long-long -Wformat-security -Wno-strict-aliasing )
216+
ADD_DEFINITIONS( -Wall -Wextra -Wredundant-decls -Wno-long-long -Wformat-security -Wno-strict-aliasing )
217217
# Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
218218
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 )
219219
ENDIF (MSVC)

‎CODING

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,10 +596,10 @@ easily, and help us deal with the patches that are sent to use easily.
596596

597597
If the patch is a fix for a specific bug, please name the file with the bug
598598
number in it e.g. bug777fix.patch, and attach it to the original bug report
599-
in trac (https://trac.osgeo.org/qgis/).
599+
in trac (http://hub.qgis.org/projects/quantum-gis).
600600

601601
If the bug is an enhancement or new feature, its usually a good idea to create
602-
a ticket in trac (https://trac.osgeo.org/qgis/) first and then attach you
602+
a ticket in trac (http://hub.qgis.org/projects/quantum-gis) first and then attach you
603603

604604

605605
2.7.2. Create your patch in the top level QGIS source dir
@@ -868,7 +868,7 @@ test before fixing the bug will let you automate the testing for bug
868868
resolution in an efficient manner.
869869

870870
To implement your regression test, you should follow the naming convention of
871-
regression<TicketID> for your test functions. If no trac ticket exists for the
871+
regression<TicketID> for your test functions. If no redmine ticket exists for the
872872
regression, you should create one first. Using this approach allows the person
873873
running a failed regression test easily go and find out more information.
874874

0 commit comments

Comments
 (0)
Please sign in to comment.