Merge commit 'origin/1.3'

src/libs/cplusplus/CppDocument.cpp

@@ -147,6 +147,16 @@ void Document::setRevision(unsigned revision)
     _revision = revision;
 }
 
+QDateTime Document::lastModified() const
+{
+    return _lastModified;
+}
+
+void Document::setLastModified(const QDateTime &lastModified)
+{
+    _lastModified = lastModified;
+}
+
 QString Document::fileName() const
 {
     return _fileName;
@@ -447,6 +457,8 @@ Document::Ptr Snapshot::documentFromSource(const QByteArray &preprocessedCode,
     Document::Ptr newDoc = Document::create(fileName);
 
     if (Document::Ptr thisDocument = value(fileName)) {
+        newDoc->_revision = thisDocument->_revision;
+        newDoc->_lastModified = thisDocument->_lastModified;
         newDoc->_includes = thisDocument->_includes;
         newDoc->_definedMacros = thisDocument->_definedMacros;
         newDoc->_macroUses = thisDocument->_macroUses;

src/libs/cplusplus/CppDocument.h

@@ -40,6 +40,7 @@
 #include <QSharedPointer>
 #include <QString>
 #include <QStringList>
+#include <QDateTime>
 
 namespace CPlusPlus {
 
@@ -63,6 +64,9 @@ public:
     unsigned revision() const;
     void setRevision(unsigned revision);
 
+    QDateTime lastModified() const;
+    void setLastModified(const QDateTime &lastModified);
+
     QString fileName() const;
 
     QStringList includedFiles() const;
@@ -310,6 +314,7 @@ private:
     QList<MacroUse> _macroUses;
     QList<UndefinedMacroUse> _undefinedMacroUses;
     QByteArray _source;
+    QDateTime _lastModified;
     unsigned _revision;
 
     friend class Snapshot;