Merge remote-tracking branch 'origin/4.4'

 Conflicts:
	qtcreator.pri

Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba

1 files changed, 6 insertions, 2 deletions

diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h
index 317fb31de9..f8cd36b131 100644
--- a/src/plugins/texteditor/textmark.h
+++ b/src/plugins/texteditor/textmark.h
@@ -64,15 +64,19 @@ public:
     int lineNumber() const;
 
     virtual void paintIcon(QPainter *painter, const QRect &rect) const;
-    virtual void paintAnnotation(QPainter *painter, QRectF *annotationRect) const;
+    virtual void paintAnnotation(QPainter &painter, QRectF *annotationRect,
+                                 const qreal fadeInOffset, const qreal fadeOutOffset) const;
     struct AnnotationRects
     {
+        QRectF fadeInRect;
         QRectF annotationRect;
         QRectF iconRect;
         QRectF textRect;
+        QRectF fadeOutRect;
         QString text;
     };
-    virtual AnnotationRects annotationRects(const QRectF &boundingRect, const QFontMetrics &fm) const;
+    AnnotationRects annotationRects(const QRectF &boundingRect, const QFontMetrics &fm,
+                                    const qreal fadeInOffset, const qreal fadeOutOffset) const;
     /// called if the filename of the document changed
     virtual void updateFileName(const QString &fileName);
     virtual void updateLineNumber(int lineNumber);