Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp

src/plugins/texteditor/basetexteditor.h

@@ -492,6 +492,11 @@ private:
                            bool active,
                            bool hovered) const;
 
+    void drawCollapsedBlockPopup(QPainter &painter,
+                                 const QTextBlock &block,
+                                 QPointF offset,
+                                 const QRect &clip);
+
     void toggleBlockVisible(const QTextBlock &block);
     QRect foldBox();