246 Commits

Author SHA1 Message Date
mhugent
9fdde26a82 Merge of changes from analysis branch
git-svn-id: http://svn.osgeo.org/qgis/trunk@11552 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-09-05 08:45:13 +00:00
jef
c080e311cb update version number to 1.3.0 in trunk
git-svn-id: http://svn.osgeo.org/qgis/trunk@11484 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-22 15:32:29 +00:00
jef
faaafd83de cope with blanks in svnversion path on windows
git-svn-id: http://svn.osgeo.org/qgis/trunk@11476 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-22 07:01:27 +00:00
jef
410d31235a improve qgssvnversion.h creation
git-svn-id: http://svn.osgeo.org/qgis/trunk@11451 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-20 15:31:45 +00:00
jef
9c30ea92ed more osgeo4w tweaks
git-svn-id: http://svn.osgeo.org/qgis/trunk@11431 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-18 21:32:20 +00:00
jef
2b5663083b more cleanups:
- don't link GSL's CBLAS. We don't use it.
- don't link GEOS and GDAL into python bindings. They don't use them directly.
- link libdl on unix when internal spatialite is used
- update SONAMEs
- fix some warnings and typos



git-svn-id: http://svn.osgeo.org/qgis/trunk@11250 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-02 15:28:05 +00:00
timlinux
78ef494f9d Changed release name to Daphnis
git-svn-id: http://svn.osgeo.org/qgis/trunk@11247 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-08-02 15:14:30 +00:00
jef
f0b412a0be include OSGeo4W build scripts
git-svn-id: http://svn.osgeo.org/qgis/trunk@11197 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-07-29 08:59:18 +00:00
jef
bcde2dcfc3 fix warnings
git-svn-id: http://svn.osgeo.org/qgis/trunk@11153 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-07-23 11:07:34 +00:00
rugginoso
cfd6c68cc5 Updated the about dialog to take care of DONORS file.
git-svn-id: http://svn.osgeo.org/qgis/trunk@11009 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-07-02 16:54:18 +00:00
timlinux
fac6117a7d Update splash and versions so its clear trunk is trunk
git-svn-id: http://svn.osgeo.org/qgis/trunk@10698 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-05-02 14:21:47 +00:00
jef
96aa36bec5 rename manual page files (fixes #1517)
git-svn-id: http://svn.osgeo.org/qgis/trunk@10612 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-21 20:18:30 +00:00
timlinux
dff219eb5e Added note on how version_int is computed
git-svn-id: http://svn.osgeo.org/qgis/trunk@10539 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-11 20:51:50 +00:00
timlinux
0358f7f273 Fix version number gaff
git-svn-id: http://svn.osgeo.org/qgis/trunk@10537 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-11 20:20:38 +00:00
timlinux
29473eac43 Update int version for 1.1 release
git-svn-id: http://svn.osgeo.org/qgis/trunk@10531 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-11 19:14:24 +00:00
timlinux
461bb4d0c1 install translators list to docs
git-svn-id: http://svn.osgeo.org/qgis/trunk@10527 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-11 10:16:16 +00:00
jef
7a4f73d0b8 apply #1566
git-svn-id: http://svn.osgeo.org/qgis/trunk@10495 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-07 12:00:39 +00:00
jef
1bfc5c6adb detect iconv on macosx
git-svn-id: http://svn.osgeo.org/qgis/trunk@10488 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-06 18:24:57 +00:00
jef
ae7aff694e internal sqlite3 was replaced with spatialite
git-svn-id: http://svn.osgeo.org/qgis/trunk@10480 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-05 19:06:54 +00:00
jef
2bfb80b93f add internal spatialite support
git-svn-id: http://svn.osgeo.org/qgis/trunk@10473 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-04-05 10:46:08 +00:00
esseffe
38f81229f0 supporting the SpatiaLite Data Provider
2009-04-24 Sandro Furieri <a.furieri@lqt.it>


git-svn-id: http://svn.osgeo.org/qgis/trunk@10414 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-03-24 20:52:12 +00:00
jef
40a0eb271f add -Wformat-security to PEDANTIC
git-svn-id: http://svn.osgeo.org/qgis/trunk@10078 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-02-01 11:55:47 +00:00
jef
037d3dbfdd remove old mapserver export plugin as it might confuse people.
git-svn-id: http://svn.osgeo.org/qgis/trunk@10004 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-01-23 17:11:30 +00:00
timlinux
bdf82cb640 Suppress cmake warnings in cmake 2.6
git-svn-id: http://svn.osgeo.org/qgis/trunk@9942 c8812cc2-4d05-0410-92ff-de0c093fc19c
2009-01-07 22:54:16 +00:00
timlinux
e1e423fc4e Mark trunk as qgis 1.1.0 unstable and updated splash so unstable is visually distinct from stable on startup
git-svn-id: http://svn.osgeo.org/qgis/trunk@9912 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-12-30 22:22:04 +00:00
timlinux
0605155436 Use trunk designation
git-svn-id: http://svn.osgeo.org/qgis/trunk@9697 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-11-24 17:31:42 +00:00
telwertowski
907589118b Update version string for preview2
git-svn-id: http://svn.osgeo.org/qgis/trunk@9602 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-11-08 22:09:55 +00:00
timlinux
a6a6f88322 Mark as preview 1
git-svn-id: http://svn.osgeo.org/qgis/trunk@9375 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-09-22 19:17:12 +00:00
jef
4b46398bc4 astyle re-indentation & iostream=>QgsDebugMsg migration cleanup
git-svn-id: http://svn.osgeo.org/qgis/trunk@9138 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-08-23 21:37:31 +00:00
jef
120a61cabe various code cleanups by mloskot for GCC 4.1 (fixes #1239, #1240).
Inspired by it I also enabled pedantic mode for MSVC and cleaned
up some more warnings found by GCC 4.3 and MSVC.




git-svn-id: http://svn.osgeo.org/qgis/trunk@9133 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-08-23 14:06:01 +00:00
timlinux
cd01927d49 Updated splash and compressed master so it requires less space in svn checkout. Updated version name in cmakelists
git-svn-id: http://svn.osgeo.org/qgis/trunk@9104 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-08-20 21:27:54 +00:00
timlinux
09f5afc34b Made new splash and version number so trunk can be distinguished from 0.11.0 branch easily
git-svn-id: http://svn.osgeo.org/qgis/trunk@8770 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-07-14 13:16:13 +00:00
timlinux
13cab55a5a Fix for ticket #1047
git-svn-id: http://svn.osgeo.org/qgis/trunk@8739 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-07-08 20:41:42 +00:00
telwertowski
784ce74d40 Remove use of Qt3 support inline routines which redirect old Qt3 names to new Qt4 names. Remove USE_QT3SUPPORT from top-level CMakeLists and add it to GRASS provider/plugin CMakeLists so that all use of Qt3 names and libraries is limited to these two directories.
git-svn-id: http://svn.osgeo.org/qgis/trunk@8630 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-06-09 03:30:50 +00:00
jef
18645c5bbb fix python fix
git-svn-id: http://svn.osgeo.org/qgis/trunk@8539 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-28 21:51:05 +00:00
jef
671b5f2b74 fix building python plugin on windows
git-svn-id: http://svn.osgeo.org/qgis/trunk@8536 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-28 19:49:14 +00:00
timlinux
f646c013ac remove superfluous ^ symbol
git-svn-id: http://svn.osgeo.org/qgis/trunk@8523 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-26 15:42:29 +00:00
timlinux
8d292c18f5 remove some duplication of version vars in top level cmakelists.txt
git-svn-id: http://svn.osgeo.org/qgis/trunk@8519 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-26 14:16:03 +00:00
timlinux
19549ff81c Dont use PREFIX on linux (or anywhere else). On linux assume prefix is appdirpath/.
This fixes issues where qgis is nor relocatable after building, and removes cmake warnings about duplicate definition of PREFIX. Note that to be relocatable you should not build using rpath support..


git-svn-id: http://svn.osgeo.org/qgis/trunk@8472 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-19 20:52:54 +00:00
jef
6f03494d8f revert r8437 and fix it different
- use FIND_PACKAGE(Qt4 REQUIRED) before SET(QT_... 1)
  as cmake's Modules/FindQt4.cmake suggests
- should also fix #913


git-svn-id: http://svn.osgeo.org/qgis/trunk@8438 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-14 22:14:36 +00:00
timlinux
c64a89cfd0 Enable qtsql module
git-svn-id: http://svn.osgeo.org/qgis/trunk@8434 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-14 18:15:40 +00:00
timlinux
3250dbceed Changed release name to Metis
git-svn-id: http://svn.osgeo.org/qgis/trunk@8432 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-14 13:05:09 +00:00
timlinux
6238e7aa05 Changed version to 0.11.0 for trunk
git-svn-id: http://svn.osgeo.org/qgis/trunk@8423 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-12 13:49:00 +00:00
telwertowski
21708a56fb Remove all use of Qt3 compatibiliy routines except for the GRASS provider/plugin. Automatic casts of QString to char* have also been removed for compatibility with Qt/Mac-Cocoa (64-bit).
git-svn-id: http://svn.osgeo.org/qgis/trunk@8406 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-05-07 05:15:58 +00:00
timlinux
1b0c716697 Updated version to 0.10.0 since this release will contain new features as well as bug fixes. I've also softcoded the places that had release numbers hard coded in various points in the code, so setting the version no in top level CMakeLists.txt should 'trickle down' into most places where version numbers need to be set.
Made some small changes to whats new too.


git-svn-id: http://svn.osgeo.org/qgis/trunk@8361 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-04-17 12:35:32 +00:00
jef
7f56f5526d debian packaging update
- update for next release
- removed some temporary files in debian/
- add version number to shared libraries names and split them into
   libqgis-core0.9, libqgis-gui0.9 and libqgisgrass0.9 (fixes #36)
- split python binding and plugins into separate package python-qgis
- merge some changes from the DebianGIS repository
- build in debian/build
- updated menu and icon
- use qgis man pages (qgis_help added)
- build on Debian unstable is lintian clean (may fix #1028)
- build also tested on OSX (Tim Sutton), MinGW (Marco Pasetti) and with MSVC


git-svn-id: http://svn.osgeo.org/qgis/trunk@8351 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-04-14 21:30:22 +00:00
timlinux
3005fd8d3b Fix for msvc so python parts build with nmake not vcexpress
git-svn-id: http://svn.osgeo.org/qgis/trunk@8288 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-27 13:08:30 +00:00
timlinux
ac3e910a05 Defined application services linkage for mac since we dont just globally link to all qgis libs now (which used to give us ap services libs in the process). Applies to OS X only.
git-svn-id: http://svn.osgeo.org/qgis/trunk@8279 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-26 03:03:44 +00:00
timlinux
405d71d42d Added the option (off by default) to build with an internal copy of sqlite3. This is the recommended approach by the author of sqlite3, but the old way (linking to an external lib) remains default for now. To use add -DWITH_INTERNAL_SQLITE3 to cmake command line
git-svn-id: http://svn.osgeo.org/qgis/trunk@8236 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-17 18:45:07 +00:00
timlinux
1cdd141f90 Changed project to 0.9.2 (removing rc1)
git-svn-id: http://svn.osgeo.org/qgis/trunk@8224 c8812cc2-4d05-0410-92ff-de0c093fc19c
2008-03-15 14:25:44 +00:00