Merge branch 'master' of https://github.com/qgis/Quantum-GIS into android

Conflicts:
	src/ui/qgsnewspatialitelayerdialogbase.ui

Author: mbernasocchi

INSTALL

@@ -1,10 +1,10 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
-Sunday November 06, 2011
+Tuesday December 27, 2011
 
 
-Last Updated: Sunday November 06, 2011
-Last Change : Sunday November 06, 2011
+Last Updated: Tuesday December 27, 2011
+Last Change : Tuesday December 27, 2011
 
 
   1. Introduction
@@ -1226,7 +1226,7 @@ http://www.kyngchaos.com/wiki/software/frameworks
 Once downloaded, open and install the frameworks.
 
 William provides an additional installer package for Postgresql (for PostGIS
-support).  Qgis just needs the libpq client library, so unless you want to
+support).  QGIS just needs the libpq client library, so unless you want to
 setup the full Postgres + PostGIS server, all you need is the client-only
 package.  It's available here:
 
@@ -1242,7 +1242,7 @@ http://www.kyngchaos.com/wiki/software/grass
 
 There are some additional dependencies that, at the time of writing, are not
 provided as frameworks or installers so we will need to build these from source.
-If you are wanting to build Qgis as a 64-bit application, you will need to 
+If you are wanting to build QGIS as a 64-bit application, you will need to 
 provide the appropriate build commands to produce 64-bit support in dependencies.
 Likewise, for 32-bit support on Snow Leopard, you will need to override the
 default system architecture, which is 64-bit, according to instructions for
@@ -1404,7 +1404,7 @@ http://pyqwt.sourceforge.net/
 
 Double-click the tarball to unpack it.  The following assumes PyQwt v5.2.0
 (comes with Qwt 5.2.1).  Normal compilation does both Qwt and PyQwt at the same
-time, but Qwt is statically linked into PyQwt, and Qgis can't use it.  So, we
+time, but Qwt is statically linked into PyQwt, and QGIS can't use it.  So, we
 need to split the build.
 
 Now, cd into the qwt-5.2 subdir in a Terminal.  Type these commands to build
@@ -1522,7 +1522,7 @@ This will automatically find and use the previously installed frameworks, and
 the GRASS application if installed.
 
 Or, to use a Unix-style build of GRASS, use the following cmake invocation
-(minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
+(minimum GRASS version as stated in the QGIS requirements, substitute the GRASS
 path and version as required):
 
   cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
@@ -1553,7 +1553,7 @@ script and add arch flags to the configuration:
   -D CMAKE_OSX_ARCHITECTURES=i386 -D PYTHON_EXECUTABLE=/usr/local/bin/python32 \
   ..
 
-The Qgis Mapserver feature requires fastcgi support.  This is included in
+The QGIS Mapserver feature requires fastcgi support.  This is included in
 Leopard and Snow Leopard, but was dropped at Lion.  To build the Mapserver
 component on Leopard and Snow, add the followling line before the last line in
 the above configuration:
@@ -1564,9 +1564,9 @@ On Lion you are on your own to figure out how to install libfcgi and add fcgi
 support to the system Apache.  Not recommended for the average user.
 
 Bundling note: Older Qt versions may have problems with some Qt plugins and
-Qgis.  The way to handle this is to bundle Qt inside the Qgis application.  You
-can do this now or wait to see if there are immediate crashes when running Qgis.
-It's also a good idea to bundle Qt if you need to copy Qgis to other Macs (where
+QGIS.  The way to handle this is to bundle Qt inside the QGIS application.  You
+can do this now or wait to see if there are immediate crashes when running QGIS.
+It's also a good idea to bundle Qt if you need to copy QGIS to other Macs (where
 you would have to install Xcode just so Qt would install!).
 
 To bundle Qt, add the following line before the last line (the ".." line) in

cmake/MacBundleMacros.cmake

@@ -31,20 +31,26 @@ ENDFUNCTION (MYMESSAGE)
 # regex stuff taken from GetPrerequisites
 
 FUNCTION (GET_INSTALL_NAME LIBFILE LIBNAME OUTVAR)
-    EXECUTE_PROCESS (COMMAND otool -L "${LIBFILE}" OUTPUT_VARIABLE iname_out)
-    # remove 1st line, it's just path to lib file
-    STRING (REGEX REPLACE ".*:\n" "" iname "${iname_out}")
-    IF (iname)
-        # find libname
-        STRING (REGEX MATCH "[^\n\t ]*${LIBNAME}[^\n ]*" iname "${iname}")
-    ENDIF (iname)
-    SET (${OUTVAR} ${iname} PARENT_SCOPE)
+    IF (EXISTS "${LIBFILE}")
+        EXECUTE_PROCESS (COMMAND otool -L "${LIBFILE}" OUTPUT_VARIABLE iname_out)
+        # remove 1st line, it's just path to lib file
+        STRING (REGEX REPLACE ".*:\n" "" iname "${iname_out}")
+        IF (iname)
+            # find libname
+            STRING (REGEX MATCH "[^\n\t ]*${LIBNAME}[^\n ]*" iname "${iname}")
+        ENDIF (iname)
+        SET (${OUTVAR} ${iname} PARENT_SCOPE)
+    ELSE ()
+        SET (${OUTVAR} "" PARENT_SCOPE)
+    ENDIF ()
 ENDFUNCTION (GET_INSTALL_NAME)
 
 # install_name_tool -change CHANGE CHANGETO CHANGEBIN
 
 FUNCTION (INSTALLNAMETOOL_CHANGE CHANGE CHANGETO CHANGEBIN)
-    EXECUTE_PROCESS (COMMAND install_name_tool -change ${CHANGE} ${CHANGETO} "${CHANGEBIN}")
+    IF (EXISTS "${CHANGEBIN}" AND CHANGE AND CHANGETO)
+        EXECUTE_PROCESS (COMMAND install_name_tool -change ${CHANGE} ${CHANGETO} "${CHANGEBIN}")
+    ENDIF ()
 ENDFUNCTION (INSTALLNAMETOOL_CHANGE)
 
 # copy a framework, only specified archs, current version, debug dep on CMAKE_BUILD_TYPE
@@ -59,22 +65,24 @@ FUNCTION (COPY_FRAMEWORK FWPREFIX FWNAME FWDEST)
         OUTPUT_VARIABLE FWDIRPHYS
     )
     STRING (STRIP "${FWDIRPHYS}" FWDIRPHYS)
-    STRING (REGEX MATCH "[^/\n]+$" FWVER "${FWDIRPHYS}")
-    EXECUTE_PROCESS (COMMAND mkdir -p "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
-    EXECUTE_PROCESS (COMMAND ln -sfh ${FWVER} "${FWDEST}/${FWNAME}.framework/Versions/Current")
-    EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}")
-    EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWNAME} "${FWDEST}/${FWNAME}.framework/${FWNAME}")
-    IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
-        EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
-        EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST}/${FWNAME}.framework/Resources")
-    ENDIF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
-    # debug variants
-    SET (FWD "${FWNAME}_debug")
-    IF ("${FWDEBUG}" STREQUAL "Debug" AND EXISTS "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
-        EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
-        EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWD} "${FWDEST}/${FWNAME}.framework/${FWD}")
-        IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM")
-            EXECUTE_PROCESS (COMMAND ditto -X ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM" "${FWDEST}/${FWNAME}.framework")
+    IF (IS_DIRECTORY "${FWDIRPHYS}")
+        STRING (REGEX MATCH "[^/\n]+$" FWVER "${FWDIRPHYS}")
+        EXECUTE_PROCESS (COMMAND mkdir -p "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
+        EXECUTE_PROCESS (COMMAND ln -sfh ${FWVER} "${FWDEST}/${FWNAME}.framework/Versions/Current")
+        EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWNAME}")
+        EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWNAME} "${FWDEST}/${FWNAME}.framework/${FWNAME}")
+        IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
+            EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}")
+            EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST}/${FWNAME}.framework/Resources")
+        ENDIF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources")
+        # debug variants
+        SET (FWD "${FWNAME}_debug")
+        IF ("${FWDEBUG}" STREQUAL "Debug" AND EXISTS "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
+            EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}/${FWD}")
+            EXECUTE_PROCESS (COMMAND ln -sf Versions/Current/${FWD} "${FWDEST}/${FWNAME}.framework/${FWD}")
+            IF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM")
+                EXECUTE_PROCESS (COMMAND ditto -X ${QARCHS} "${FWPREFIX}/${FWNAME}.framework/${FWD}.dSYM" "${FWDEST}/${FWNAME}.framework")
+            ENDIF ()
         ENDIF ()
     ENDIF ()
 ENDFUNCTION (COPY_FRAMEWORK)
@@ -95,16 +103,17 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
         ENDIF ()
         SET (LIB_CHG_TO "${ATEXECUTABLE}/${LIBMID}/${LIBPOST}")
         # app - always @executable_path
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QAPPDIR}/${QGIS_APP_NAME}")
-        # qgis_help, qbrowser - doesn't link anything else than Qt/Qgis
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/qgis_help.app/Contents/MacOS/qgis_help")
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/qbrowser.app/Contents/MacOS/qbrowser")
+        INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QAPPDIR}/${QGIS_APP_NAME}")
+        # qgis helper apps - don't link anything else than Qt/Qgis
+        FOREACH (QA ${QGAPPLIST})
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QBINDIR}/${QA}.app/Contents/MacOS/${QA}")
+        ENDFOREACH (QA)
         # qgis-mapserver
         IF (${WITH_MAPSERVER})
             IF (${OSX_HAVE_LOADERPATH})
                 SET (LIB_CHG_TO "${ATEXECUTABLE}/${QGIS_CGIBIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
             ENDIF ()
-            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QCGIDIR}/qgis_mapserv.fcgi")
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QCGIDIR}/qgis_mapserv.fcgi")
         ENDIF ()
         # libs
         IF (${OSX_HAVE_LOADERPATH})
@@ -116,40 +125,40 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
             ENDIF ()
         ENDIF ()
         FOREACH (QL ${QGFWLIST})
-            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QFWDIR}/${QL}.framework/${QL}")
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QFWDIR}/${QL}.framework/${QL}")
         ENDFOREACH (QL)
         # libqgispython is not a framework
         IF (${OSX_HAVE_LOADERPATH})
             SET (LIB_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         ENDIF ()
-        INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QLIBDIR}/libqgispython.dylib")
+        INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBDIR}/libqgispython.dylib")
         # GRASS libexec stuff
         IF (EXISTS "${QLIBXDIR}/grass/bin/qgis.g.browser")
            IF (${OSX_HAVE_LOADERPATH})
                SET (LIB_CHG_TO "${ATLOADER}/../../${QGIS_LIBEXEC_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
            ENDIF ()
-           INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QLIBXDIR}/grass/bin/qgis.g.browser")
+           INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBXDIR}/grass/bin/qgis.g.browser")
         ENDIF ()
         # plugins
         IF (${OSX_HAVE_LOADERPATH})
             SET (LIB_CHG_TO "${ATLOADER}/${QGIS_PLUGIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         ENDIF ()
         FOREACH (QP ${QGPLUGLIST})
-            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QP}")
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QP}")
         ENDFOREACH (QP)
         # qgis python
         IF (${OSX_HAVE_LOADERPATH})
             SET (LIB_CHG_TO "${ATLOADER}/../../${QGIS_DATA_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         ENDIF ()
         FOREACH (PG ${QGPYLIST})
-            INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${PG}")
+            INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${PG}")
         ENDFOREACH (PG)
         # bin - nothing yet
         #IF (${OSX_HAVE_LOADERPATH})
         #    SET (LIB_CHG_TO "${ATLOADER}/${QGIS_BIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         #ENDIF ()
         #FOREACH (PB ...)
-        #    INSTALLNAMETOOL_CHANGE (${LIBFROM} ${LIB_CHG_TO} "${QBINDIR}/${PB}")
+        #    INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QBINDIR}/${PB}")
         #ENDFOREACH (PB)
     ENDIF (LIBFROM)
 ENDFUNCTION (UPDATEQGISPATHS)
@@ -177,8 +186,10 @@ FOREACH (QARCH ${CMAKE_OSX_ARCHITECTURES})
 ENDFOREACH (QARCH)
 
 # common file lists
-FILE (GLOB QGFWLIST RELATIVE ${QFWDIR} ${QFWDIR}/qgis*.framework)
+FILE (GLOB QGFWLIST RELATIVE "${QFWDIR}" "${QFWDIR}/qgis*.framework")
 # for some reason, REPLACE is stripping list seps
 STRING(REPLACE ".framework" ";" QGFWLIST ${QGFWLIST})
-FILE (GLOB QGPLUGLIST ${QPLUGDIR}/*.so)
-FILE (GLOB QGPYLIST ${QGISPYDIR}/qgis/*.so)
+FILE (GLOB QGPLUGLIST "${QPLUGDIR}/*.so")
+FILE (GLOB QGPYLIST "${QGISPYDIR}/qgis/*.so")
+FILE (GLOB QGAPPLIST RELATIVE "${QBINDIR}" "${QBINDIR}/q*.app")
+STRING(REPLACE ".app" ";" QGAPPLIST ${QGAPPLIST})

cmake/SIPMacros.cmake

@@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
         ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
       ELSE(MSVC)
         # disable all warnings
-        ADD_DEFINITIONS( -w )
+        ADD_DEFINITIONS( -w -fpermissive )
       ENDIF(MSVC)
     ENDIF(PEDANTIC)
 

doc/changelog.t2t

@@ -129,7 +129,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
 - Reduce top and side margins for attribute table dialog
 - Remove the (hopefully) last SVN reference
 - More svn version removal
-- Added missing colour accessor/mutator/member from composerlegenditem header
+- Added missing color accessor/mutator/member from composerlegenditem header
 - Get rid of svn version stuff from release branch.
 - Other workaround for Qt#5114 (fixes #3250, #3028, #2598)
 - Try to make the histogram smoother
@@ -264,7 +264,7 @@ changed so we will just provide a bullet list of key new features here.
 
 - Support for icons of plugins in the plugin manager dialog.
 - Removed quickprint plugin - use easyprint plugin rather from plugin repo.
-- Removed ogr convertor plugin - use 'save as' context menu rather.
+- Removed ogr converter plugin - use 'save as' context menu rather.
 - 
 
 ==Printing==

doc/osx.t2t

@@ -83,7 +83,7 @@ http://www.kyngchaos.com/wiki/software/frameworks
 Once downloaded, open and install the frameworks.
 
 William provides an additional installer package for Postgresql (for PostGIS
-support).  Qgis just needs the libpq client library, so unless you want to
+support).  QGIS just needs the libpq client library, so unless you want to
 setup the full Postgres + PostGIS server, all you need is the client-only
 package.  It's available here:
 
@@ -97,7 +97,7 @@ http://www.kyngchaos.com/wiki/software/grass
 
 There are some additional dependencies that, at the time of writing, are not
 provided as frameworks or installers so we will need to build these from source.
-If you are wanting to build Qgis as a 64-bit application, you will need to 
+If you are wanting to build QGIS as a 64-bit application, you will need to 
 provide the appropriate build commands to produce 64-bit support in dependencies.
 Likewise, for 32-bit support on Snow Leopard, you will need to override the
 default system architecture, which is 64-bit, according to instructions for
@@ -274,7 +274,7 @@ http://pyqwt.sourceforge.net/
 
 Double-click the tarball to unpack it.  The following assumes PyQwt v5.2.0
 (comes with Qwt 5.2.1).  Normal compilation does both Qwt and PyQwt at the same
-time, but Qwt is statically linked into PyQwt, and Qgis can't use it.  So, we
+time, but Qwt is statically linked into PyQwt, and QGIS can't use it.  So, we
 need to split the build.
 
 Now, cd into the qwt-5.2 subdir in a Terminal.  Type these commands to build
@@ -399,7 +399,7 @@ This will automatically find and use the previously installed frameworks, and
 the GRASS application if installed.
 
 Or, to use a Unix-style build of GRASS, use the following cmake invocation
-(minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
+(minimum GRASS version as stated in the QGIS requirements, substitute the GRASS
 path and version as required):
 
 ```
@@ -434,7 +434,7 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
 ..
 ```
 
-The Qgis Mapserver feature requires fastcgi support.  This is included in
+The QGIS Mapserver feature requires fastcgi support.  This is included in
 Leopard and Snow Leopard, but was dropped at Lion.  To build the Mapserver
 component on Leopard and Snow, add the followling line before the last line in
 the above configuration:
@@ -447,9 +447,9 @@ On Lion you are on your own to figure out how to install libfcgi and add fcgi
 support to the system Apache.  Not recommended for the average user.
 
 __Bundling note:__ Older Qt versions may have problems with some Qt plugins and
-Qgis.  The way to handle this is to bundle Qt inside the Qgis application.  You
-can do this now or wait to see if there are immediate crashes when running Qgis.
-It's also a good idea to bundle Qt if you need to copy Qgis to other Macs (where
+QGIS.  The way to handle this is to bundle Qt inside the QGIS application.  You
+can do this now or wait to see if there are immediate crashes when running QGIS.
+It's also a good idea to bundle Qt if you need to copy QGIS to other Macs (where
 you would have to install Xcode just so Qt would install!).
 
 To bundle Qt, add the following line before the last line (the ".." line) in