Also registry HTML annotation when webkit isn't available

nyalldawson · nyalldawson · commit f80b92a23f0a · 2017-01-30T19:19:24.000+10:00
diff --git a/src/core/annotations/qgsannotationregistry.h b/src/core/annotations/qgsannotationregistry.h
@@ -88,9 +88,7 @@ class CORE_EXPORT QgsAnnotationRegistry
     QgsAnnotationRegistry()
     {
       addAnnotationType( QgsAnnotationMetadata( QStringLiteral( "TextAnnotationItem" ), QgsTextAnnotation::create ) );
-#ifdef WITH_QTWEBKIT
       addAnnotationType( QgsAnnotationMetadata( QStringLiteral( "HtmlAnnotationItem" ), QgsHtmlAnnotation::create ) );
-#endif
       addAnnotationType( QgsAnnotationMetadata( QStringLiteral( "SVGAnnotationItem" ), QgsSvgAnnotation::create ) );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,7 @@ class CORE_EXPORT QgsAnnotationRegistry`
`88`	`88`	`QgsAnnotationRegistry()`
`89`	`89`	`{`
`90`	`90`	`addAnnotationType( QgsAnnotationMetadata( QStringLiteral( "TextAnnotationItem" ), QgsTextAnnotation::create ) );`
`91`		`-#ifdef WITH_QTWEBKIT`
`92`	`91`	`addAnnotationType( QgsAnnotationMetadata( QStringLiteral( "HtmlAnnotationItem" ), QgsHtmlAnnotation::create ) );`
`93`		`-#endif`
`94`	`92`	`addAnnotationType( QgsAnnotationMetadata( QStringLiteral( "SVGAnnotationItem" ), QgsSvgAnnotation::create ) );`
`95`	`93`	`}`
`96`	`94`