Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fix loading of labeling from 2.x projects
- Loading branch information
Showing
with
4 additions
and
2 deletions.
-
+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; |
|
|