Skip to content

Commit 23af7f7

Browse files
luipirluipir
committedSep 11, 2013
Merge remote-tracking branch 'upstream/master'
·
ltr-3_40archive/master_2
2 parents 4200046 + ba4e438 commit 23af7f7

Some content is hidden

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

46 files changed

+100421
-87126
lines changed
 

‎BUGS

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
Help I think I found a bug!
22
---------------------------
33

4-
If you find a bug in QGIS, you can report it using the QGIS ticket/bug database at:
4+
If you find a bug in QGIS, you can search for it
5+
6+
http://hub.qgis.org/search/index/quantum-gis/issues
7+
8+
If you can't find an exisitng ticket, report it using the QGIS ticket/bug database at:
59

610
http://hub.qgis.org/projects/quantum-gis/issues/new
711

812

913
Some hints about when you should file a bug:
1014

1115

12-
- just because a bug is filed doesn't always mean we can or will fix it.
16+
- Just because a bug is filed doesn't always mean we can or will fix it.
1317
Sometimes people ask for things that will require many man hours to do and
1418
offer little reward to work ratio benefit when compared to the other issues
1519
in the queue. Also some things are simply not fixable due to whatever
1620
technical reason.
17-
- sometimes we don't fix a bug because the user's vision of how QGIS should
21+
- Sometimes we don't fix a bug because the user's vision of how QGIS should
1822
behave doesn't match ours. Hey we are all humans it can happen...
19-
- always check that your bug has not already been filed by someone else since
23+
- Always check that your bug has not already been filed by someone else since
2024
dealing with duplicate tickets causes a lot of time wasting.
21-
- always provide contact details and make sure you are subscribed to the
25+
- Always provide contact details and make sure you are subscribed to the
2226
ticket entry (either by adding yourself to CC field or by logging in before
2327
filing the ticket).
24-
- don't be offended if we don't see tickets as having the same priority as you
28+
- Don't be offended if we don't see tickets as having the same priority as you
2529
do. While we appreciate it's inconvenient if some issue prevents you doing
2630
your work, we need to take the big picture view of things and focus on
2731
things that affect the largest proportion of our user base.

‎CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ ELSE (ANDROID)
102102
SET (DEFAULT_WITH_QTMOBILITY FALSE)
103103
ENDIF (ANDROID)
104104
SET (WITH_QTMOBILITY ${DEFAULT_WITH_QTMOBILITY} CACHE BOOL "Determines if QtMobility related code should be build (for example internal GPS)")
105-
IF (WITH_QTMOBILITY)
106-
FIND_PACKAGE(QtMobility 1.1.0)
107-
ENDIF (WITH_QTMOBILITY)
108105

109106
SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
110107
IF (WITH_GLOBE)
@@ -234,6 +231,10 @@ IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT
234231
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
235232
ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND)
236233

234+
IF (WITH_QTMOBILITY)
235+
FIND_PACKAGE(QtMobility 1.1.0)
236+
ENDIF (WITH_QTMOBILITY)
237+
237238
IF (ANDROID)
238239
SET (DEFAULT_WITH_TOUCH TRUE)
239240
ELSE (ANDROID)
@@ -605,12 +606,12 @@ IF (GIT_MARKER)
605606
# Get GIT remote and branch
606607
EXECUTE_PROCESS(
607608
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
608-
COMMAND ${GITCOMMAND} name-rev --name-only HEAD OUTPUT_VARIABLE GIT_LOCAL_BRANCH
609+
COMMAND ${GITCOMMAND} name-rev --name-only HEAD OUTPUT_VARIABLE GIT_LOCAL_BRANCH
609610
)
610611
STRING(STRIP "${GIT_LOCAL_BRANCH}" GIT_LOCAL_BRANCH)
611612
EXECUTE_PROCESS(
612613
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
613-
COMMAND ${GITCOMMAND} config branch.${GIT_LOCAL_BRANCH}.remote OUTPUT_VARIABLE GIT_REMOTE
614+
COMMAND ${GITCOMMAND} config branch.${GIT_LOCAL_BRANCH}.remote OUTPUT_VARIABLE GIT_REMOTE
614615
)
615616
STRING(STRIP "${GIT_REMOTE}" GIT_REMOTE)
616617
EXECUTE_PROCESS(
@@ -681,7 +682,7 @@ ENDIF (APPLE)
681682

682683
# manual page - makes sense only on unix systems
683684
IF (UNIX AND NOT APPLE)
684-
INSTALL (FILES qgis.1 DESTINATION ${QGIS_MANUAL_DIR}/man1)
685+
INSTALL (FILES qgis.1 qbrowser.1 DESTINATION ${QGIS_MANUAL_DIR}/man1)
685686
ENDIF (UNIX AND NOT APPLE)
686687

687688
INSTALL(FILES cmake/FindQGIS.cmake DESTINATION ${QGIS_DATA_DIR})

0 commit comments

Comments
 (0)
Please sign in to comment.