sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading of labeling from 2.x projects

Browse Source
This commit is contained in:
Martin Dobias 2017-05-15 12:13:15 +08:00
parent 53f8e7f744
commit 56309efc4c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/qgsmaplayer.cpp
View File

@ -377,6 +377,10 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, const QgsReadWr
savedValidation = QgsCoordinateReferenceSystem::customCrsValidation(); savedValidation = QgsCoordinateReferenceSystem::customCrsValidation();
QgsCoordinateReferenceSystem::setCustomCrsValidation( nullptr ); QgsCoordinateReferenceSystem::setCustomCrsValidation( nullptr );
// read custom properties before passing reading further to a subclass, so that
// the subclass can also read custom properties
readCustomProperties( layerElement );
// now let the children grab what they need from the Dom node. // now let the children grab what they need from the Dom node.
layerError = !readXml( layerElement, context ); layerError = !readXml( layerElement, context );
@ -504,8 +508,6 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, const QgsReadWr
} }
#endif #endif
readCustomProperties( layerElement );
mMetadata.readFromLayer( this ); mMetadata.readFromLayer( this );
return true; return true;