Merge "Merge remote-tracking branch 'origin/4.6'"

2 files changed, 9 insertions, 5 deletions

diff --git a/src/plugins/clangcodemodel/clangrefactoringengine.cpp b/src/plugins/clangcodemodel/clangrefactoringengine.cpp
index d639e27667..bb985a650e 100644
--- a/src/plugins/clangcodemodel/clangrefactoringengine.cpp
+++ b/src/plugins/clangcodemodel/clangrefactoringengine.cpp
@@ -51,10 +51,14 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
     if (cursorFuture.isCanceled())
         return defaultCallback();
 
-    QObject::connect(&m_watcher, &FutureCursorWatcher::finished, [=]() {
-        if (m_watcher.isCanceled())
+    if (m_watcher)
+        m_watcher->cancel();
+
+    m_watcher.reset(new FutureCursorWatcher());
+    QObject::connect(m_watcher.get(), &FutureCursorWatcher::finished, [=]() {
+        if (m_watcher->isCanceled())
             return defaultCallback();
-        const CppTools::CursorInfo info = m_watcher.result();
+        const CppTools::CursorInfo info = m_watcher->result();
         if (info.useRanges.empty())
             return defaultCallback();
 
@@ -72,7 +76,7 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
         renameSymbolsCallback(symbolName, container, data.cursor().document()->revision());
     });
 
-    m_watcher.setFuture(cursorFuture);
+    m_watcher->setFuture(cursorFuture);
 }
 
 }
diff --git a/src/plugins/clangcodemodel/clangrefactoringengine.h b/src/plugins/clangcodemodel/clangrefactoringengine.h
index fee9a85cf5..79537f24df 100644
--- a/src/plugins/clangcodemodel/clangrefactoringengine.h
+++ b/src/plugins/clangcodemodel/clangrefactoringengine.h
@@ -57,7 +57,7 @@ public:
 
 private:
     using FutureCursorWatcher = QFutureWatcher<CppTools::CursorInfo>;
-    FutureCursorWatcher m_watcher;
+    std::unique_ptr<FutureCursorWatcher> m_watcher;
 };
 
 } // namespace ClangRefactoring