CMakeLists.txt

@@ -80,6 +80,17 @@ IF (WITH_BINDINGS)
   SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
 ENDIF (WITH_BINDINGS)
 
+#BUILD WITH QtMobility by default on android only. Other platform can force it
+IF (ANDROID)
+    SET (DEFAULT_WITH_QTMOBILITY TRUE)
+ELSE (ANDROID)
+    SET (DEFAULT_WITH_QTMOBILITY FALSE)
+ENDIF (ANDROID)
+SET (WITH_QTMOBILITY ${DEFAULT_WITH_QTMOBILITY} CACHE BOOL "Determines 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)
   SET(QT_USE_QTOPENGL 1)

INSTALL

@@ -1,10 +1,10 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
-Tuesday December 27, 2011
+Monday February 06, 2012
 
 
-Last Updated: Tuesday December 27, 2011
-Last Change : Tuesday December 27, 2011
+Last Updated: Monday February 06, 2012
+Last Change : Wednesday February 01, 2012
 
 
   1. Introduction

cmake/FindQtMobility.cmake

@@ -0,0 +1,163 @@
+INCLUDE(FindQt4)
+
+set(MOBILITY_CONFIG_MKSPECS_FILE "")
+IF(EXISTS "${QT_MKSPECS_DIR}/features/mobilityconfig.prf")
+    set(MOBILITY_CONFIG_MKSPECS_FILE "${QT_MKSPECS_DIR}/features/mobilityconfig.prf")
+ELSEIF(EXISTS "${QT_MKSPECS_DIR}/features/mobility.prf")
+    set(MOBILITY_CONFIG_MKSPECS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmakes/mobilityconfig.prf")
+ENDIF()
+
+macro(export_component component)
+    IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "")
+        FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_FILE_CONTENTS)
+        STRING(TOLOWER ${component} _COMPONENT)
+        IF(${MOBILITY_FILE_CONTENTS} MATCHES "MOBILITY_CONFIG=.*${_COMPONENT}.*")
+            STRING(TOUPPER ${component} _COMPONENT)
+            SET(QT_MOBILITY_${_COMPONENT}_FOUND 1)
+            SET(QT_MOBILITY_${_COMPONENT}_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/Qt${component})
+            SET(QT_MOBILITY_${_COMPONENT}_LIBRARY Qt${component})
+            ADD_DEFINITIONS(-DHAVE_QT_MOBILITY_${_COMPONENT})
+        ENDIF()
+    ENDIF()
+endmacro()
+
+set(VERSION_INFO "")
+set(FEATURE_FILE_PREFIX "${QT_MKSPECS_DIR}/features/mobility")
+
+if(DEFINED MOBILITY_VERSION)
+    if(MOBILITY_VERSION STREQUAL "1.1" AND EXISTS "${FEATURE_FILE_PREFIX}11.prf")
+        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}11.prf")
+        set(VERSION_INFO "1.1")
+    elseif(MOBILITY_VERSION STREQUAL "1.2" AND EXISTS "${FEATURE_FILE_PREFIX}12.prf")
+        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}12.prf")
+        set(VERSION_INFO "1.2")
+    elseif(MOBILITY_VERSION STREQUAL "default" AND EXISTS "${FEATURE_FILE_PREFIX}.prf")
+        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}.prf")
+        set(VERSION_INFO "system's default")
+    else()
+        message(STATUS "Couldn't find QtMobility version: ${MOBILITY_VERSION}")
+    endif()
+endif()
+
+if(NOT DEFINED MOBILITY_PRF_FILE)
+    if(EXISTS "${FEATURE_FILE_PREFIX}.prf")
+        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}.prf")
+        set(VERSION_INFO "system's default")
+    elseif(EXISTS "${FEATURE_FILE_PREFIX}12.prf")
+        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}12.prf")
+        set(VERSION_INFO "1.2")
+    elseif(EXISTS "${FEATURE_FILE_PREFIX}11.prf")
+        set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}11.prf")
+        set(VERSION_INFO "1.1")
+    else()
+        message(FATAL_ERROR "Couldn't find any version of QtMobility.")
+    endif()
+endif()
+
+message(STATUS "Using QtMobility version: ${VERSION_INFO}")
+
+IF(DEFINED MOBILITY_PRF_FILE)
+    FILE(READ ${MOBILITY_PRF_FILE} MOBILITY_FILE_CONTENTS)
+
+    STRING(REGEX MATCH "MOBILITY_PREFIX=([^\n]+)" QT_MOBILITY_PREFIX "${MOBILITY_FILE_CONTENTS}")
+    SET(QT_MOBILITY_PREFIX ${CMAKE_MATCH_1})
+
+    STRING(REGEX MATCH "MOBILITY_INCLUDE=([^\n]+)" QT_MOBILITY_INCLUDE_DIR "${MOBILITY_FILE_CONTENTS}")
+    SET(QT_MOBILITY_INCLUDE_DIR ${CMAKE_MATCH_1})
+
+    STRING(REGEX MATCH "MOBILITY_LIB=([^\n]+)" "\\1" QT_MOBILITY_LIBRARY "${MOBILITY_FILE_CONTENTS}")
+    SET(QT_MOBILITY_LIBRARY_DIR ${CMAKE_MATCH_1})
+
+    #VERSION
+    IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "")
+        FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_CONFIG_FILE_CONTENTS)
+        STRING(REGEX MATCH "MOBILITY_VERSION = ([^\n]+)" QT_MOBILITY_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}")
+        SET(QT_MOBILITY_VERSION ${CMAKE_MATCH_1})
+
+        STRING(REGEX MATCH "MOBILITY_MAJOR_VERSION = ([^\n]+)" QT_MOBILITY_MAJOR_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}")
+        SET(QT_MOBILITY_MAJOR_VERSION ${CMAKE_MATCH_1})
+
+        STRING(REGEX MATCH "MOBILITY_MINOR_VERSION = ([^\n]+)" QT_MOBILITY_MINOR_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}")
+        SET(QT_MOBILITY_MINOR_VERSION ${CMAKE_MATCH_1})
+
+        STRING(REGEX MATCH "MOBILITY_PATCH_VERSION = ([^\n]+)" QT_MOBILITY_PATCH_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}")
+        SET(QT_MOBILITY_PATCH_VERSION ${CMAKE_MATCH_1})
+
+        message(STATUS "QtMobility version: ${QT_MOBILITY_VERSION}")
+    ELSE()
+        SET(QT_MOBILITY_VERSION 1.0.0)
+        SET(QT_MOBILITY_MAJOR_VERSION 1)
+        SET(QT_MOBILITY_MINOR_VERSION 0)
+        SET(QT_MOBILITY_PATCH_VERSION 0)
+    ENDIF()
+
+    SET(QT_MOBILITY_PARENT_INCLUDE_DIR ${QT_MOBILITY_INCLUDE_DIR})
+    SET(QT_MOBILITY_INCLUDE_DIR ${QT_MOBILITY_INCLUDE_DIR}/QtMobility)
+
+    IF(QtMobility_FIND_VERSION_EXACT)
+        IF(QT_MOBILITY_VERSION VERSION_EQUAL QtMobility_FIND_VERSION)
+            SET(QT_MOBILITY_FOUND TRUE)
+        ELSE()
+            SET(QT_MOBILITY_FOUND FALSE)
+            IF(QT_MOBILITY_VERSION VERSION_LESS QtMobility_FIND_VERSION)
+                SET(QT_MOBILITY_TOO_OLD TRUE)
+            ELSE()
+                SET(QT_MOBILITY_TOO_NEW TRUE)
+            ENDIF()
+        ENDIF()
+    ELSE()
+        IF(QT_MOBILITY_VERSION VERSION_LESS QtMobility_FIND_VERSION)
+            SET(QT_MOBILITY_FOUND FALSE)
+            SET(QT_MOBILITY_TOO_OLD TRUE)
+        ELSE()
+            SET(QT_MOBILITY_FOUND TRUE)
+        ENDIF()
+    ENDIF()
+ELSE()
+    SET(QT_MOBILITY_FOUND NOTFOUND)
+    SET(QT_MOBILITY_PREFIX NOTFOUND)
+    SET(QT_MOBILITY_INCLUDE NOTFOUND)
+    SET(QT_MOBILITY_LIB NOTFOUND)
+ENDIF()
+
+IF(NOT QT_MOBILITY_FOUND)
+    if(QT_MOBILITY_TOO_OLD)
+        MESSAGE(FATAL_ERROR "The installed QtMobility version ${QT_MOBILITY_VERSION} it too old, version ${QtMobility_FIND_VERSION} is required.")
+    ELSEIF(QT_MOBILITY_TOO_NEW)
+        MESSAGE(FATAL_ERROR "The installed QtMobility version ${QT_MOBILITY_VERSION} it too new, version ${QtMobility_FIND_VERSION} is required.")
+    ELSE()
+        MESSAGE(FATAL_ERROR "QtMobility not found.")
+    ENDIF()
+ELSE()
+    INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
+    export_component(Bearer)
+    export_component(Feedback)
+    export_component(Gallery)
+    export_component(PublishSubscribe)
+    export_component(Location)
+    export_component(Organizer)
+    export_component(ServiceFramework)
+    export_component(SystemInfo)
+    export_component(Contacts)
+    export_component(Connectivity)
+    export_component(Messaging)
+    export_component(Versit)
+    export_component(Sensors)
+    # VersitOrganizer
+    if(QT_MOBILITY_VERSIT_FOUND AND QT_MOBILITY_ORGANIZER_FOUND)
+        SET(QT_MOBILITY_VERSITORGANIZER_FOUND 1)
+        SET(QT_MOBILITY_VERSITORGANIZER_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/QtVersitOrganizer)
+        SET(QT_MOBILITY_VERSITORGANIZER_LIBRARY QtVersitOrganizer)
+    endif()
+
+    # MultimediaKit - it's just 'multimedia' in the .prf file.
+    IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "")
+        FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_FILE_CONTENTS)
+        IF(${MOBILITY_FILE_CONTENTS} MATCHES "MOBILITY_CONFIG=.*multimedia.*")
+            SET(QT_MOBILITY_MULTIMEDIAKIT_FOUND 1)
+            SET(QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/QtMultimediaKit)
+            SET(QT_MOBILITY_MULTIMEDIAKIT_LIBRARY QtMultimediaKit)
+        ENDIF()
+    ENDIF()
+
+ENDIF()

debian/changelog

@@ -2,8 +2,9 @@ qgis (1.9.90) UNRELEASED; urgency=low
 
   * new development version 1.9.90 after branch of 1.8.0
   * include function help in package
+  * include heatmap plugin
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 26 Nov 2011 23:43:48 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Mon, 13 Feb 2012 17:38:05 +0100
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

debian/qgis.install

@@ -13,6 +13,7 @@ usr/lib/qgis/plugins/libspatialqueryplugin.so
 usr/lib/qgis/plugins/libofflineeditingplugin.so
 usr/lib/qgis/plugins/libroadgraphplugin.so
 usr/lib/qgis/plugins/libzonalstatisticsplugin.so
+usr/lib/qgis/plugins/libheatmapplugin.so
 usr/lib/qgis/qgis_help
 usr/share/pixmaps/qgis-icon.xpm
 usr/share/pixmaps/qgis-mime-icon.png

doc/AUTHORS

@@ -43,3 +43,4 @@ Giuseppe Sucameli	<brush.tyler at gmail.com>
 Alessandro Furieri	<a.furieri at lqt.it>
 Alexander Bruy	<alexander.bruy@gmail.com>
 Marco Bernasocchi	<marco at bernawebdesign dot ch>
+Nathan Woodrow	<woodrow.nathan at gmail.com>

doc/CONTRIBUTORS

@@ -4,10 +4,10 @@
 # feedback, reviews and/or many other things that have aided the development of
 # QGIS:
 #
-Alexander Bruy
 Andres Manz
 Anita Graser
 Arthur Nanni
+Arunmozhi
 Baba Yoshihiko
 Brent Wood
 Brook Milligan
@@ -42,7 +42,6 @@ Matt Amos
 Maurizio Napolitano
 Mayeul Kauffmann
 Milena Nowotarska
-Nathan Woodrow
 Nikos Alexandris
 Paul Ramsey
 Richard Duivenvoorde

doc/INSTALL.html

@@ -80,13 +80,13 @@
 <DIV CLASS="header" ID="header">
 <H1>Quantum GIS (QGIS)</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Sunday November 06, 2011</H3>
+<H3>Monday February 06, 2012</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Sunday November 06, 2011
-Last Change : Sunday November 06, 2011
+Last Updated: Monday February 06, 2012
+Last Change : Wednesday February 01, 2012
 </P>
 <DIV CLASS="toc">
 
@@ -1753,7 +1753,7 @@ <H2>5.2. Install development frameworks for QGIS dependencies</H2>
 </P>
 <P>
 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:
 </P>
@@ -1772,7 +1772,7 @@ <H3>5.2.1. Additional Dependencies: General compatibility note</H3>
 <P>
 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
@@ -2001,7 +2001,7 @@ <H3>5.2.6. Additional Dependencies: Qwt/PyQwt</H3>
 <P>
 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.
 </P>
 <P>
@@ -2155,7 +2155,7 @@ <H2>5.5. Configure the build</H2>
 </P>
 <P>
 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):
 </P>
 
@@ -2194,7 +2194,7 @@ <H2>5.5. Configure the build</H2>
 </PRE></div>
 
 <P>
-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:
@@ -2210,9 +2210,9 @@ <H2>5.5. Configure the build</H2>
 </P>
 <P>
 <U>Bundling note:</U> 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!).
 </P>
 <P>
@@ -2311,5 +2311,5 @@ <H1>6. Authors and Acknowledgments</H1>
 
 </DIV>
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
-<!-- cmdline: txt2tags -t html -o INSTALL.html INSTALL.t2t -->
+<!-- cmdline: txt2tags -o INSTALL.html -t html INSTALL.t2t -->
 </BODY></HTML>

doc/TRANSLATORS

@@ -25,7 +25,7 @@ Greek|Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves
 Hungarian|Siki Zoltan
 Icelandic|Thordur Ivarsson
 Indonesian|Januar V. Simarmata
-Italian|Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano
+Italian|Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna
 Japanese|BABA Yoshihiko, Yoichi Kayama
 Lao|Anousak Souphavanh
 Latvian|Maris Nartiss, Pēteris Brūns