Skip to content
Permalink
Browse files

Fix loading of labeling from 2.x projects

  • Loading branch information
wonder-sk committed May 16, 2017
1 parent 53f8e7f commit 56309efc4cefb5eceeb7184cabaf0d1709a7b274
Showing with 4 additions and 2 deletions.
  1. +4 −2 src/core/qgsmaplayer.cpp
@@ -377,6 +377,10 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, const QgsReadWr
savedValidation = QgsCoordinateReferenceSystem::customCrsValidation();
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.
layerError = !readXml( layerElement, context );

@@ -504,8 +508,6 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, const QgsReadWr
}
#endif

readCustomProperties( layerElement );

mMetadata.readFromLayer( this );

return true;

0 comments on commit 56309ef

Please sign in to comment.