Merge remote-tracking branch 'origin/4.6'

 Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f

2 files changed, 9 insertions, 1 deletions

diff --git a/src/plugins/texteditor/generichighlighter/specificrules.cpp b/src/plugins/texteditor/generichighlighter/specificrules.cpp
index 8c4b80dc66..82a9de23ca 100644
--- a/src/plugins/texteditor/generichighlighter/specificrules.cpp
+++ b/src/plugins/texteditor/generichighlighter/specificrules.cpp
@@ -247,6 +247,14 @@ bool RegExprRule::doMatchSucceed(const QString &text,
     return false;
 }
 
+RegExprRule *RegExprRule::doClone() const
+{
+    auto clone = new RegExprRule(*this);
+    if (m_progress)
+        m_progress->trackRule(clone);
+    return clone;
+}
+
 // Keyword
 KeywordRule::KeywordRule(const QSharedPointer<HighlightDefinition> &definition) :
     m_overrideGlobal(false),
diff --git a/src/plugins/texteditor/generichighlighter/specificrules.h b/src/plugins/texteditor/generichighlighter/specificrules.h
index 63beaf8df9..a5533dcd0d 100644
--- a/src/plugins/texteditor/generichighlighter/specificrules.h
+++ b/src/plugins/texteditor/generichighlighter/specificrules.h
@@ -124,7 +124,7 @@ private:
     virtual bool doMatchSucceed(const QString &text,
                                 const int length,
                                 ProgressData *progress);
-    virtual RegExprRule *doClone() const { return new RegExprRule(*this); }
+    virtual RegExprRule *doClone() const;
     virtual void doReplaceExpressions(const QStringList &captures);
     virtual void doProgressFinished();