Merge remote-tracking branch 'origin/2.5'

Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp

Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d

src/plugins/cpptools/doxygengenerator.cpp

@@ -56,7 +56,6 @@ DoxygenGenerator::DoxygenGenerator()
     , m_generateBrief(true)
     , m_startComment(true)
     , m_style(QtStyle)
-    , m_commentOffset(0)
 {}
 
 void DoxygenGenerator::setStyle(DocumentationStyle style)
@@ -308,16 +307,11 @@ void DoxygenGenerator::assignCommentOffset(QTextCursor cursor)
             cursor.setPosition(cursor.anchor());
     }
 
-    m_commentOffset = cursor.positionInBlock();
+    cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
+    m_commentOffset = cursor.selectedText();
 }
 
 QString DoxygenGenerator::offsetString() const
 {
-    // Note: Currently we don't indent comments, but simply preserve them in the original
-    // relative positions. What we do here is just to make sure that such positions are correct,
-    // although they might still be wrong from an indentation point of view (for instance,
-    // using spaces instead of tabs). Therefore, the content generated should still have
-    // the indentation strings fixed.
-
-    return QString(m_commentOffset, QLatin1Char(' '));
+    return m_commentOffset;
 }

src/plugins/cpptools/doxygengenerator.h

@@ -95,7 +95,7 @@ private:
     bool m_startComment;
     DocumentationStyle m_style;
     CPlusPlus::Overview m_printer;
-    int m_commentOffset;
+    QString m_commentOffset;
 };
 
 } // CppTools