mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-13 00:03:09 -04:00
9317ffd89a
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