Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
new fix for #1162 restoring lost qml features
git-svn-id: http://svn.osgeo.org/qgis/trunk@9747 c8812cc2-4d05-0410-92ff-de0c093fc19c
- Loading branch information
Showing
with
552 additions
and 523 deletions.
- +1 −1 python/core/qgsmaplayer.sip
- +1 −1 python/core/qgsrasterlayer.sip
- +2 −2 python/core/qgssymbol.sip
- +1 −1 python/core/qgsvectorlayer.sip
- +1 −1 src/core/composer/qgscomposeritem.cpp
- +2 −2 src/core/composer/qgscomposeritem.h
- +1 −1 src/core/composer/qgscomposeritemgroup.cpp
- +1 −1 src/core/composer/qgscomposeritemgroup.h
- +1 −1 src/core/composer/qgscomposerlabel.cpp
- +1 −1 src/core/composer/qgscomposerlabel.h
- +35 −35 src/core/composer/qgscomposerlegend.cpp
- +1 −1 src/core/composer/qgscomposerlegend.h
- +4 −1 src/core/composer/qgscomposermap.cpp
- +1 −1 src/core/composer/qgscomposermap.h
- +5 −5 src/core/composer/qgscomposerpicture.cpp
- +1 −1 src/core/composer/qgscomposerpicture.h
- +1 −1 src/core/composer/qgscomposerscalebar.cpp
- +1 −1 src/core/composer/qgscomposerscalebar.h
- +3 −3 src/core/composer/qgslegendmodel.cpp
- +1 −1 src/core/composer/qgslegendmodel.h
- +3 −1 src/core/qgsattributeaction.cpp
- +1 −1 src/core/qgsattributeaction.h
- +10 −10 src/core/qgsgeometry.cpp
- +168 −151 src/core/qgslabel.cpp
- +14 −7 src/core/qgslabel.h
- +187 −189 src/core/qgsvectorlayer.cpp
- +5 −3 src/core/qgsvectorlayer.h
- +6 −6 src/core/raster/qgsrasterlayer.cpp
- +9 −9 src/core/renderer/qgscontinuouscolorrenderer.cpp
- +6 −8 src/core/renderer/qgsgraduatedsymbolrenderer.cpp
- +3 −3 src/core/renderer/qgssinglesymbolrenderer.cpp
- +3 −3 src/core/renderer/qgsuniquevaluerenderer.cpp
- +59 −68 src/core/symbology/qgssymbol.cpp
- +13 −2 src/core/symbology/qgssymbol.h
Oops, something went wrong.