Martin Dobias
|
9317ffd89a
|
Merge remote-tracking branch 'origin/master' into new_vector_api
Also disabled mapserver until compilation is fixed.
Fixed tests.
Conflicts:
src/app/legend/qgslegendlayer.cpp
src/app/qgsattributedialog.cpp
src/app/qgsattributedialog.h
src/app/qgslabelpropertydialog.cpp
src/app/qgsmaptoollabel.cpp
src/app/qgsvectorlayerproperties.cpp
src/core/CMakeLists.txt
src/core/composer/qgsatlascomposition.cpp
src/core/qgsexpression.cpp
src/core/qgspallabeling.cpp
src/core/qgsvectorlayer.cpp
src/core/qgsvectorlayer.h
src/core/qgsvectorlayerimport.cpp
src/mapserver/qgsprojectparser.cpp
src/mapserver/qgswfsserver.cpp
src/mapserver/qgswfsserver.h
src/mapserver/qgswmsserver.cpp
src/providers/postgres/qgspostgresprovider.cpp
src/providers/spatialite/qgsspatialiteprovider.h
tests/src/core/testqgsexpression.cpp
tests/src/python/test_qgsmemoryprovider.py
|
2012-12-18 01:35:06 +01:00 |
|
Juergen E. Fischer
|
8a2ea36a6e
|
[FEATURE] make desktop build optional (but default; fixes #4756)
|
2012-01-09 00:43:09 +01:00 |
|
William Kyngesburye
|
405226893f
|
OS X frameworks for qgis libs;
dev frameworks install option;
cmake cleanup
|
2011-07-04 11:15:40 -05:00 |
|
Juergen E. Fischer
|
b74a515e94
|
cmake: replace deprecated SUBDIRS with ADD_SUBDIRECTORY
|
2011-05-27 22:45:08 +02:00 |
|
Martin Dobias
|
b20619623f
|
Merge branch 'master' into dbl
Conflicts:
images/splash/splash.png
src/CMakeLists.txt
src/app/main.cpp
src/app/qgsvectorlayerproperties.cpp
src/core/qgsvectorlayer.cpp
src/providers/wms/qgswmssourceselect.cpp
|
2011-05-13 22:20:43 +02:00 |
|
Martin Dobias
|
153ad164fe
|
All customization and QGIS browser work in one commit.
|
2011-05-13 22:00:46 +02:00 |
|
Jürgen E. Fischer
|
dcc723c067
|
some more svn to git migration updates/fixes
|
2011-05-06 16:39:45 +02:00 |
|
Juergen E. Fischer
|
a9aafd0713
|
apply #3645: synchronization of srs.db with GDAL/PROJ on installation
|
2011-05-05 22:28:42 +02:00 |
|
jef
|
ee82cf496b
|
missed a file in r14597.
git-svn-id: http://svn.osgeo.org/qgis/trunk@14598 c8812cc2-4d05-0410-92ff-de0c093fc19c
|
2010-11-13 15:39:24 +00:00 |
|
mhugent
|
98d7559487
|
[FEATURE]: Add QGIS mapserver sources to svn repository
git-svn-id: http://svn.osgeo.org/qgis/trunk@14110 c8812cc2-4d05-0410-92ff-de0c093fc19c
|
2010-08-21 09:23:12 +00:00 |
|
wonder
|
87c5348818
|
Native and faster compilation of python bindings (#2370)
git-svn-id: http://svn.osgeo.org/qgis/trunk@12774 c8812cc2-4d05-0410-92ff-de0c093fc19c
|
2010-01-16 11:04:41 +00:00 |
|
jef
|
44b7fd348a
|
fix more line endings
git-svn-id: http://svn.osgeo.org/qgis/trunk@11650 c8812cc2-4d05-0410-92ff-de0c093fc19c
|
2009-09-13 10:49:37 +00:00 |
|
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 |
|
wonder
|
ab06574c81
|
Moved python support to a library, QGIS app now during the initialization tries to load that library.
git-svn-id: http://svn.osgeo.org/qgis/trunk@8530 c8812cc2-4d05-0410-92ff-de0c093fc19c
|
2008-05-28 12:35:20 +00:00 |
|
telwertowski
|
de5c8f730c
|
For Mac, install everything into an application bundle.
git-svn-id: http://svn.osgeo.org/qgis/trunk@6420 c8812cc2-4d05-0410-92ff-de0c093fc19c
|
2007-01-11 22:16:41 +00:00 |
|
wonder
|
46a2d125a2
|
Merged refactoring branch back to trunk.
git-svn-id: http://svn.osgeo.org/qgis/trunk@6415 c8812cc2-4d05-0410-92ff-de0c093fc19c
|
2007-01-09 02:39:15 +00:00 |
|