Merge remote-tracking branch 'origin/3.0'

src/plugins/cpptools/abstracteditorsupport.cpp

@@ -38,7 +38,7 @@
 namespace CppTools {
 
 AbstractEditorSupport::AbstractEditorSupport(CppModelManagerInterface *modelmanager) :
-    m_modelmanager(modelmanager)
+    m_modelmanager(modelmanager), m_revision(0)
 {
 }
 
@@ -48,6 +48,7 @@ AbstractEditorSupport::~AbstractEditorSupport()
 
 void AbstractEditorSupport::updateDocument()
 {
+    ++m_revision;
     m_modelmanager->updateSourceFiles(QStringList(fileName()));
 }
 

src/plugins/cpptools/abstracteditorsupport.h

@@ -50,6 +50,7 @@ public:
     virtual QString fileName() const = 0;
 
     void updateDocument();
+    unsigned revision() const { return m_revision; }
 
     // TODO: find a better place for common utility functions
     static QString functionAt(const CppModelManagerInterface *mm,
@@ -60,6 +61,7 @@ public:
 
 private:
     CppModelManagerInterface *m_modelmanager;
+    unsigned m_revision;
 };
 
 } // namespace CppTools

src/plugins/cpptools/cppmodelmanager.cpp

@@ -550,7 +550,7 @@ CppModelManager::WorkingCopy CppModelManager::buildWorkingCopyList()
     QSetIterator<AbstractEditorSupport *> it(m_extraEditorSupports);
     while (it.hasNext()) {
         AbstractEditorSupport *es = it.next();
-        workingCopy.insert(es->fileName(), es->contents());
+        workingCopy.insert(es->fileName(), es->contents(), es->revision());
     }
 
     // Add the project configuration file