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

…roid
qgis · Nov 13, 2011 · 559af8a · 559af8a
2 parents 76244bc + f8bbe8f
commit 559af8a
Show file tree

Hide file tree

Showing 1,575 changed files with 78,158 additions and 44,179 deletions.
diff --git a/BUGS b/BUGS
@@ -3,7 +3,7 @@ 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:
 
-http://trac.osgeo.org/qgis/report
+http://hub.qgis.org/projects/quantum-gis/issues/new
 
 
 Some hints about when you should file a bug:
@@ -25,6 +25,3 @@ Some hints about when you should file a bug:
    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.
-
-
-$Id$
diff --git a/CHANGELOG b/CHANGELOG
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "8")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "9")
+SET(CPACK_PACKAGE_VERSION_PATCH "90")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-SET(RELEASE_NAME "Trunk")
+SET(RELEASE_NAME "Alpha")
 SET(PROJECT_VERSION ${COMPLETE_VERSION})
 PROJECT(qgis${PROJECT_VERSION})
 IF (APPLE)
@@ -18,8 +18,8 @@ MESSAGE(STATUS "Quantum GIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS
 #############################################################
 # CMake settings
 
-# 2.6 required for QtWebkit
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+# 2.6.2 required for VERSION_LESS
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
 
 SET(CMAKE_COLOR_MAKEFILE ON)
 
@@ -51,7 +51,9 @@ IF (WITH_POSTGRESQL)
   SET (POSTGRESQL_PREFIX "" CACHE PATH "Path to POSTGRESQL base directory")
 ENDIF (WITH_POSTGRESQL)
 
-SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal built of QwtPolar")
+SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
+
+SET (WITH_INTERNAL_SPATIALINDEX TRUE CACHE BOOL "Use internal build of Spatialindex")
 
 SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")
 
@@ -136,6 +138,11 @@ FIND_PACKAGE(Expat)    # GPS importer plugin
 FIND_PACKAGE(GSL)      # Georeferencer
 FIND_PACKAGE(GEOS)
 FIND_PACKAGE(GDAL)
+
+IF (NOT WITH_INTERNAL_SPATIALINDEX)
+  FIND_PACKAGE(Spatialindex REQUIRED)
+ENDIF(NOT WITH_INTERNAL_SPATIALINDEX)
+
 FIND_PACKAGE(Qwt REQUIRED)
 IF (NOT WITH_INTERNAL_QWTPOLAR)
   FIND_PACKAGE(QwtPolar REQUIRED)
@@ -219,9 +226,10 @@ IF (PEDANTIC)
     ADD_DEFINITIONS( /wd4610 )  # user defined constructor required (sqlite3_index_info)
     ADD_DEFINITIONS( /wd4706 )  # assignment within conditional expression (pal)
   ELSE (MSVC)
-    ADD_DEFINITIONS( -Wall -Wextra -Wredundant-decls -Wno-long-long -Wformat-security -Wno-strict-aliasing )
+    ADD_DEFINITIONS( -Wall -Wextra  -Wno-long-long -Wformat-security -Wno-strict-aliasing )
     # Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
-    # ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 )
+    # There are redundant declarations in Qt and GDAL
+    # ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )
   ENDIF (MSVC)
 ENDIF (PEDANTIC)
 

diff --git a/CODING b/CODING
@@ -58,8 +58,14 @@ Developers guide for QGIS
     3.4. The ADD_QGIS_TEST macro explained
     3.5. Building your unit test
     3.6. Run your tests
-  4. HIG (Human Interface Guidelines)
-  5. Authors
+  4. Getting up and running with QtCreator and QGIS
+    4.1. Installing QtCreator
+    4.2. Setting up your project
+    4.3. Setting up your build environment
+    4.4. Setting your run environment
+    4.5. Running and debugging
+  5. HIG (Human Interface Guidelines)
+  6. Authors
 
 
 ------------------------------------------------------------------------
@@ -1208,7 +1214,163 @@ works in a truly platform way. I will update this document as things
 progress.
 
 
-  4. HIG (Human Interface Guidelines)
+  4. Getting up and running with QtCreator and QGIS
+  =================================================
+
+QtCreator is a newish IDE from the makers of the Qt library. With QtCreator you
+can build any C++ project, but it's really optimised for people working on
+Qt(4) based applications (including mobile apps). Everything I describe below
+assumes you are running Ubuntu 11.04 'Natty'.
+
+
+  4.1. Installing QtCreator
+  =========================
+
+This part is easy:
+
+  sudo apt-get install qtcreator qtcreator-doc
+
+After installing you should find it in your gnome menu.
+
+
+  4.2. Setting up your project
+  ============================
+
+I'm assuming you have already got a local Quantum-GIS clone containing the
+source code, and have installed all needed build dependencies etc. There are
+detailed in instructions on doing that here:
+
+http://github.com/qgis/Quantum-GIS/blob/master/CODING
+
+On my system I have checked out the code into $HOME/dev/cpp/Quantum-GIS and the
+rest of the article is written assuming that, you should update these paths as
+appropriate for your local system.
+
+On launching QtCreator do:
+
+  File->Open File or Project
+
+Then use the resulting file selection dialog to browse to and open this file:
+
+  $HOME/dev/cpp/Quantum-GIS/CMakeLists.txt
+
+[images/image01.jpeg]
+
+Next you will be prompted for a build location. I create a specific build dir
+for QtCreator to work in under:
+
+  $HOME/dev/cpp/Quantum-GIS/build-master-qtcreator
+
+Its probably a good idea to create separate build directories for different
+branches if you can afford the disk space.
+
+[images/image02.jpeg]
+
+Next you will be asked if you have any CMake build options to pass to CMake. We
+will tell CMake that we want a debug build by adding this option:
+
+  -DCMAKE_BUILD_TYPE=Debug
+
+[images/image03.jpeg]
+
+Thats the basics of it. When you complete the Wizard, QtCreator will start
+scanning the source tree for autocompletion support and do some other
+housekeeping stuff in the background. We want to tweak a few things before we
+start to build though.
+
+
+  4.3. Setting up your build environment
+  ======================================
+
+Click on the 'Projects' icon on the left of the QtCreator window.
+
+[images/image04.jpeg]
+
+Select the build settings tab (normally active by default).
+
+[images/image05.jpeg]
+
+We now want to add a custom process step. Why? Because QGIS can currently only
+run from an install directory, not its build directory, so we need to ensure
+that it is installed whenever we build it.  Under 'Build Steps', click on the
+'Add Build  Step' combo button and choose 'Custom Process Step'.
+
+[images/image06.jpeg]
+
+Now we set the following details:
+
+  Enable custom process step [yes]
+  Command: make
+  Working directory: $HOME/dev/cpp/Quantum-GIS/build-master-qtcreator
+  Command arguments: install
+
+[images/image07.jpeg]
+
+You are almost ready to build. Just one note: QtCreator will need write
+permissions on the install prefix.  By default (which I am using here) QGIS is
+going to get installed to /usr/local. For my purposes on my development
+machine, I just gave myself write permissions to the /usr/local directory.
+
+To start the build, click that big hammer icon on the bottom left of the
+window.
+
+[images/image08.jpeg]
+
+
+  4.4. Setting your run environment
+  =================================
+
+As mentioned above, we cannot run QGIS from directly in the build directly, so
+we need to create a custom run target to tell QtCreator to run QGIS from the
+install dir (in my case /usr/local/). To do that, return to the projects
+configuration screen.
+
+[images/image04.jpeg]
+
+Now select the 'Run Settings' tab
+
+[images/image09.jpeg]
+
+We need to update the default run settings from using the 'qgis' run
+configuration to using a custom one.
+
+[images/image10.jpeg]
+
+Do do that, click the 'Add v' combo button next to the Run configuration
+combo and choose 'Custom Executable' from the top of the list.
+
+[images/image11.jpeg]
+
+Now in the properties area set the following details:
+
+  Executable: /usr/local/bin/qgis
+  Arguments :
+  Working directory: $HOME
+  Run in terminal: [no]
+  Debugger: C++ [yes]
+            Qml [no]
+
+Then click the 'Rename' button and give your custom executable a meaning full
+name e.g. 'Installed QGIS'
+
+[images/image12.jpeg]          
+
+
+  4.5. Running and debugging
+  ==========================
+
+Now you are ready to run and debug QGIS. To set a break point, simply open a
+source file and click in the left column.
+
+[images/image14.jpeg]
+
+Now launch QGIS under the debugger by clicking the icon with a bug on it in the
+bottom left of the window.
+
+[images/image13.jpeg]          
+
+
+  5. HIG (Human Interface Guidelines)
   ===================================
 
 In order for all graphical user interface elements to appear consistant and to
@@ -1257,7 +1419,7 @@ guidelines are followed in layout and design of GUIs.
    suffixed to the button text.
 
 
-  5. Authors
+  6. Authors
   ==========
 
 - Tim Sutton (author and editor)

diff --git a/COPYING b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -318,7 +318,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.