Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information
luipir committed Sep 11, 2013
2 parents 4200046 + ba4e438 commit 23af7f7e160b24e8531b6a171bff05ac6d6f14c9
Showing with 100,421 additions and 87,126 deletions.
  1. +10 −6 BUGS
  2. +7 −6 CMakeLists.txt
  3. +98,807 −86,951 ChangeLog
  4. +5 −5 INSTALL
  5. +177 −110 NEWS
  6. +1 −1 README
  7. +4 −3 cmake/FindPythonLibrary.cmake
  8. +2 −2 cmake/FindQtMobility.cmake
  9. +92 −1 doc/news.t2t
  10. +1 −1 images/images.qrc
  11. BIN images/themes/default/mActionSplitFeatures.png
  12. +790 −0 images/themes/default/mActionSplitParts.svg
  13. +4 −0 python/CMakeLists.txt
  14. +2 −0 python/core/composer/qgscomposerscalebar.sip
  15. +2 −0 python/core/gps/qgsqtlocationconnection.sip
  16. +6 −0 python/core/qgsapplication.sip
  17. +3 −1 python/core/qgsclipper.sip
  18. +1 −0 python/gui/qgisinterface.sip
  19. +1 −1 python/utils.py
  20. +15 −0 scripts/create_changelog.sh
  21. +2 −0 src/app/CMakeLists.txt
  22. +6 −0 src/app/composer/qgscomposer.cpp
  23. +6 −0 src/app/main.cpp
  24. +45 −0 src/app/qgisapp.cpp
  25. +9 −0 src/app/qgisapp.h
  26. +1 −0 src/app/qgisappinterface.cpp
  27. +1 −0 src/app/qgisappinterface.h
  28. +1 −1 src/app/qgsmaptoolshowhidelabels.cpp
  29. +119 −0 src/app/qgsmaptoolsplitparts.cpp
  30. +31 −0 src/app/qgsmaptoolsplitparts.h
  31. +6 −2 src/core/gps/qgsqtlocationconnection.h
  32. +6 −0 src/core/qgsapplication.cpp
  33. +12 −0 src/core/qgsapplication.h
  34. +42 −23 src/core/qgsgeometry.cpp
  35. +10 −0 src/core/qgsgeometry.h
  36. +5 −4 src/core/qgsmaplayerregistry.h
  37. +9 −0 src/core/qgsvectorlayer.cpp
  38. +9 −0 src/core/qgsvectorlayer.h
  39. +127 −0 src/core/qgsvectorlayereditutils.cpp
  40. +9 −0 src/core/qgsvectorlayereditutils.h
  41. +1 −0 src/gui/qgisinterface.h
  42. +2 −1 src/gui/qgsattributedialog.h
  43. +5 −5 src/gui/qgsmapcanvas.h
  44. +10 −0 src/gui/qgsmessagelogviewer.cpp
  45. +2 −1 src/gui/qgsmessagelogviewer.h
  46. +15 −1 src/ui/qgisapp.ui
16 BUGS
@@ -1,27 +1,31 @@
Help I think I found a bug!
---------------------------

If you find a bug in QGIS, you can report it using the QGIS ticket/bug database at:
If you find a bug in QGIS, you can search for it

http://hub.qgis.org/search/index/quantum-gis/issues

If you can't find an exisitng ticket, report it using the QGIS ticket/bug database at:

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


Some hints about when you should file a bug:


- just because a bug is filed doesn't always mean we can or will fix it.
- Just because a bug is filed doesn't always mean we can or will fix it.
Sometimes people ask for things that will require many man hours to do and
offer little reward to work ratio benefit when compared to the other issues
in the queue. Also some things are simply not fixable due to whatever
technical reason.
- sometimes we don't fix a bug because the user's vision of how QGIS should
- Sometimes we don't fix a bug because the user's vision of how QGIS should
behave doesn't match ours. Hey we are all humans it can happen...
- always check that your bug has not already been filed by someone else since
- Always check that your bug has not already been filed by someone else since
dealing with duplicate tickets causes a lot of time wasting.
- always provide contact details and make sure you are subscribed to the
- Always provide contact details and make sure you are subscribed to the
ticket entry (either by adding yourself to CC field or by logging in before
filing the ticket).
- don't be offended if we don't see tickets as having the same priority as you
- Don't be offended if we don't see tickets as having the same priority as you
do. While we appreciate it's inconvenient if some issue prevents you doing
your work, we need to take the big picture view of things and focus on
things that affect the largest proportion of our user base.
@@ -102,9 +102,6 @@ ELSE (ANDROID)
SET (DEFAULT_WITH_QTMOBILITY FALSE)
ENDIF (ANDROID)
SET (WITH_QTMOBILITY ${DEFAULT_WITH_QTMOBILITY} CACHE BOOL "Determines if QtMobility related code should be build (for example internal GPS)")
IF (WITH_QTMOBILITY)
FIND_PACKAGE(QtMobility 1.1.0)
ENDIF (WITH_QTMOBILITY)

SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
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
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
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)

IF (WITH_QTMOBILITY)
FIND_PACKAGE(QtMobility 1.1.0)
ENDIF (WITH_QTMOBILITY)

IF (ANDROID)
SET (DEFAULT_WITH_TOUCH TRUE)
ELSE (ANDROID)
@@ -605,12 +606,12 @@ IF (GIT_MARKER)
# Get GIT remote and branch
EXECUTE_PROCESS(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${GITCOMMAND} name-rev --name-only HEAD OUTPUT_VARIABLE GIT_LOCAL_BRANCH
COMMAND ${GITCOMMAND} name-rev --name-only HEAD OUTPUT_VARIABLE GIT_LOCAL_BRANCH
)
STRING(STRIP "${GIT_LOCAL_BRANCH}" GIT_LOCAL_BRANCH)
EXECUTE_PROCESS(
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${GITCOMMAND} config branch.${GIT_LOCAL_BRANCH}.remote OUTPUT_VARIABLE GIT_REMOTE
COMMAND ${GITCOMMAND} config branch.${GIT_LOCAL_BRANCH}.remote OUTPUT_VARIABLE GIT_REMOTE
)
STRING(STRIP "${GIT_REMOTE}" GIT_REMOTE)
EXECUTE_PROCESS(
@@ -681,7 +682,7 @@ ENDIF (APPLE)

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

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

0 comments on commit 23af7f7

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