Fix label font size unit from 2.x projects incorrectly restored (fix #16143)

nyalldawson · nyalldawson · commit 6ca2cc18ef73 · 2017-02-06T08:32:32.000+10:00
diff --git a/src/core/qgstextrenderer.cpp b/src/core/qgstextrenderer.cpp
@@ -1382,8 +1382,8 @@ void QgsTextFormat::readFromLayer( QgsVectorLayer* layer )
 
   if ( layer->customProperty( QStringLiteral( "labeling/fontSizeUnit" ) ).toString().isEmpty() )
   {
-    d->fontSizeUnits = layer->customProperty( QStringLiteral( "labeling/fontSizeInMapUnits" ), 0 ).toUInt() == 0 ?
-                       QgsUnitTypes::RenderPoints : QgsUnitTypes::RenderMapUnits;
+    d->fontSizeUnits = layer->customProperty( QStringLiteral( "labeling/fontSizeInMapUnits" ), QVariant( false ) ).toBool() ?
+                       QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderPoints;
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -1382,8 +1382,8 @@ void QgsTextFormat::readFromLayer( QgsVectorLayer* layer )`
`1382`	`1382`
`1383`	`1383`	`if ( layer->customProperty( QStringLiteral( "labeling/fontSizeUnit" ) ).toString().isEmpty() )`
`1384`	`1384`	`{`
`1385`		`- d->fontSizeUnits = layer->customProperty( QStringLiteral( "labeling/fontSizeInMapUnits" ), 0 ).toUInt() == 0 ?`
`1386`		`- QgsUnitTypes::RenderPoints : QgsUnitTypes::RenderMapUnits;`
	`1385`	`+ d->fontSizeUnits = layer->customProperty( QStringLiteral( "labeling/fontSizeInMapUnits" ), QVariant( false ) ).toBool() ?`
	`1386`	`+ QgsUnitTypes::RenderMapUnits : QgsUnitTypes::RenderPoints;`
`1387`	`1387`	`}`
`1388`	`1388`	`else`
`1389`	`1389`	`{`