Fix failing tests

qgis · Jan 30, 2017 · 1f7758a · 1f7758a
1 parent 10c40dc
commit 1f7758a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/gui/qgsformannotation.h b/src/gui/qgsformannotation.h
@@ -23,8 +23,12 @@
 #include <QWidget>
 #include "qgis_gui.h"
 
-/** \ingroup gui
- * An annotation item that embedds a designer form showing the feature attribute*/
+/**
+ * \class QgsFormAnnotation
+ * \ingroup gui
+ * An annotation item that embeds a designer form showing the feature attribute
+ * \note Added in QGIS 3.0
+*/
 class GUI_EXPORT QgsFormAnnotation: public QgsAnnotation
 {
     Q_OBJECT

diff --git a/...ed_html_feature/expected_html_feature.png → ...feature/default/expected_html_feature.png b/...ed_html_feature/expected_html_feature.png → ...feature/default/expected_html_feature.png
diff --git a/...ntrol_images/annotations/expected_html_feature/travis/expected_html_feature.png b/...ntrol_images/annotations/expected_html_feature/travis/expected_html_feature.png