Merge remote branch 'origin/1.3'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/watchhandler.cpp

src/plugins/texteditor/basetexteditor.cpp

@@ -2027,6 +2027,9 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
                              d->m_ifdefedOutFormat.background());
     }
 
+    // Set a brush origin so that the WaveUnderline knows where the wave started
+    painter.setBrushOrigin(offset);
+
 //    // keep right margin clean from full-width selection
 //    int maxX = offset.x() + qMax((qreal)viewportRect.width(), documentLayout->documentSize().width())
 //               - doc->documentMargin();