doc/qtcreator.qdoc

@@ -5,7 +5,7 @@
 
     \title Qt Creator Manual
 
-    \section1 Version 1.2.93
+    \section1 Version 1.3.0
 
     The goal of Qt Creator is to provide a cross-platform, complete Integrated
     Development Environment (IDE) to develop Qt projects. It is available for
@@ -27,7 +27,7 @@
        \o   \l{A Quick Tour of Qt Creator}
        \o   \l{Creating a Project in Qt Creator}
        \o   \l{The Code Editor}
-       \o   \l{Build Settings}
+       \o   \l{Project Settings}
        \o   \l{Qt Version Management}
        \o   \l{Writing a Simple Program with Qt Creator}
        \o   \l{Qt Creator and Version Control Systems}
@@ -180,7 +180,7 @@
 /*! \contentspage index.html
     \previouspage creator-quick-tour.html
     \page creator-code-editor.html
-    \nextpage creator-build-settings.html
+    \nextpage creator-project-pane.html
 
     \title The Code Editor
 
@@ -318,10 +318,10 @@
 /*!
     \contentspage index.html
     \previouspage creator-code-editor.html
-    \page creator-build-settings.html
+    \page creator-project-pane.html
     \nextpage creator-version-management.html
 
-    \title Build Settings
+    \title Project Settings
 
     \table
         \row
@@ -330,56 +330,63 @@
                 \l{CMake Support in Qt Creator}.
     \endtable
 
-    To modify the build settings of your project, switch to the \gui{Projects}
-    mode using the mouse or with \key{Ctrl+4}.
+    To modify the project settings of your project, switch to the \gui{Projects}
+    mode using the mouse or \key{Ctrl+4}.
 
-    \image qtcreator-buildsettingstab.png
+    \image qtcreator-projectpane.png
 
-    Action items to create, clone, or delete build configurations can be found
-    at the bottom of the dialog. You can have as many build configurations as
-    needed. By default Qt Creator creates a \bold{debug} and \bold{release}
-    build configuration. Both these configurations use the
-    \l{glossary-default-qt}{Default Qt Version}.
+    The project pane is divided into two areas. At the top the currently active
+    settings are shown. The active build or run configuration for all projects
+    can be changed there. The bottom area allows you to quickly get an overview
+    of the build, run and editor settings as well as the dependencies between your
+    projects. It also allows you to edit those settings.
 
-    In the tree on the left, a list of build configurations and their settings
-    are displayed. The screenshot above shows the \bold{debug} and
-    \bold{release} configurations and their corresponding settings:
-    \bold{Build Environment} and \bold{Build Steps}.
+    \section1 Build Settings
 
-    When you select a build configuration in the tree, a configuration page for
-    general build settings will be displayed. Here you can specify which
-    \l{glossary-project-qt}{Qt version} to use to build your project, whether
+    Build configurations allow you to quickly switch between different build
+    settings. By default Qt Creator Qt Creator creates a \bold{debug} and
+    \bold{release} build configuration. Both these configurations use the
+    \l{glossary-default-qt}{Default Qt Version}. Action items to create, clone,
+    or delete build configurations can be found at the top. You can have as
+    many build configurations as needed. To edit settings click on the
+    \gui{Show Details} button. Here you can specify which
+    \l{glossary-project-qt}{Qt version} to use to build your project, or whether
     to \l{glossary-shadow-build}{shadow build} the project, for instance.
 
-    \image qtcreator-buildenvironment.png
+    \image qtcreator-ppbuildsettings.png
 
-    In the \bold{Build Environment} page you can specify the environment used
+    The build system of Qt Creator is built on top of \c qmake and \c make. The
+    settings for \c qmake and \c make can be changed. Qt Creator will run the
+    make command using the correct Qt version.
+
+    In the \bold{Build Environment} section you can specify the environment used
     for building. By default the environment in which Qt Creator was started
     is used and modified to include the Qt version. Depending on the selected
     Qt version, Qt Creator will automatically set the necessary environment
     variables.
 
-    \image qtcreator-buildsteps.png
+    \section1 Run Settings
 
-    The build system of Qt Creator is built on top of \c qmake and \c make. The
-    settings for \c qmake and \c make can be changed in the
-    \bold{Build Settings} page. Qt Creator will run the make command using the
-    correct Qt version.
+    \image qtcreator-pprunsettings.png
+    Qt Creator automatically creates run configurations for your project.
+    These run configurations derive their executable
+    from the parsed .pro files. You can also create \bold{custom executable}
+    run configurations where you can freely set the executable to be run.
 
     \section1 Dependencies
 
     If you have multiple projects loaded in your session, you can configure
     dependencies between them. This will affect the build order of your
-    projects. To do this, go the the \bold{Dependencies} tab after selecting
+    projects. To do this, go the the \bold{Dependencies} section after selecting
     the project for which you want to configure the dependencies, and then use
     the checkboxes to check which of the other projects is a dependency.
-
+    \note This is unrelated to the dependencies inside a qmake project.
 */
 
 
 /*!
     \contentspage index.html
-    \previouspage creator-build-settings.html
+    \previouspage creator-project-pane.html
     \page creator-version-management.html
     \nextpage creator-creating-project.html
 
@@ -390,7 +397,7 @@
 
     Qt Creator automatically detects if \c qmake is in the environment variable
     \c PATH. This \l{glossary-system-qt}{version of Qt} is referred to as
-    \bold{Auto-detected Qt}. If you intend to use only one version of Qt - it is
+    \bold{Qt in PATH}. If you intend to use only one version of Qt - it is
     already in your path and correctly set up for command line usage - you do
     not need to manually configure your Qt version.
 
@@ -406,7 +413,8 @@
             \i \image qtcreator-qt4-qtversions.png
                On Linux and Mac OS X, simply set the \gui{Path to QMake}
                to the \c qmake binary of the Qt installation. If a Qt is
-               found in the \c PATH environment variable, it will show up.
+               found in the \c PATH environment variable, it will show up
+	       automatically as \gui{Qt in PATH}.
                
                On both platforms, the platforms Gnu Compiler Collection (GCC)
                is used to compile Qt. On Mac OS, the GCC compiler is part of XCode.
@@ -438,13 +446,20 @@
         \row
             \i \image qtcreator-qt4-qtversions-win-symbian.png
                If you are using Qt for Symbian and your S60 SDK is registered
-               with \c devices.exe, Qt Creator will detect the Qt version automatically.
-               A known issue is that you cannot just point Creator to \c qmake.exe of Qt for Symbian.
-               You can add the path to the Metrowerks Compiler (\gui {MWC Directory})
-               if you want to use to build for the emulator. This requires Carbide 2.0
-               to be installed. the MWC directory should then point to the directory 
-               of your Carbide installation. However, this not needed for compiling for
-               the device.
+               with \c devices.exe, Qt Creator will detect the Qt version
+	       automatically. These are shown in the \bold{Auto-detected}
+	       section in the options dialog.
+	       You can also manually add Qt for Symbian versions. In this case
+	       you need to tell Qt Creator the path to the S60 SDK
+	       it is supposed to use with these Qt installations.
+               Add the path to your Carbide C++ install, version 2.0
+	       or later, if you want to build for the emulator
+	       (\c WINSCW tool chain).
+	       If you want to use \c GCCE to build for your device,
+	       you might need to add the path to the
+	       \c{CSL Arm Toolchain} directory (\gui{CSL/GCCE Directory}),
+	       if the compiler is not found in the \c PATH environment
+	       variable.
         \endtable
     
     \note By default projects are compiled with the
@@ -1088,8 +1103,9 @@
     watchers, registers, etc, Qt Creator comes with additional features to make
     debugging Qt-based applications easy. The debugger frontend knows about the
     internal layout of several Qt classes such as QString, the QTL containers,
-    and most importantly QObject (and classes derived from it). Therefore, it
-    is able to present Qt's data clearly.
+    and most importantly QObject (and classes derived from it), as well as 
+    most containers of the C++ Standard Library, and is therefore able to
+    present their contents in a useful way.
 
 
     \section1 Debugger Engine Installation Notes
@@ -1255,7 +1271,7 @@
     parameters of the function in that frame as well as the local variables.
 
     Compound variables of struct or class type will be displayed as
-    "expandable" in the view. C lick on the "+" to expand the entry and show
+    "expandable" in the view. Click on the "+" to expand the entry and show
     all members. Together with the display of value and type, the user can
     examine and traverse the low-level layout of an object's data.
 
@@ -1284,8 +1300,8 @@
 
     The \gui{Locals and Watchers} view also provides access to the most
     powerful feature of the debugger: comprehensive display of data belonging
-    to Qt's basic objects. To enable this feature, select \gui{Use Custom
-    Display for Qt Objects} from the \gui Debug menu.The
+    to Qt's basic objects. To enable this feature, select \gui{Use
+    debugging helper} from the \gui Debug menu.The
     \gui{Locals and Watchers} view will be re-organized to provide a high-level
     view of the objects. For example, in case of QObject, instead of displaying
     a pointer to some private data structure, you will see a list of children,
@@ -1423,7 +1439,8 @@
     \title CMake Support in Qt Creator
 
     Since Qt Creator 1.1, support for \c CMake project files is available.
-
+    Qt Creator 1.3 supports the Microsoft Toolchain if the cmake version
+    is at least 2.8.
 
     \section1 Opening CMake Projects
 
@@ -1446,9 +1463,9 @@
 
     \section1 Building CMake Projects
 
-    Qt Creator builds \c CMake Projects by running \c make or \c mingw32-make,
-    depending on your platform. The build errors and warnings are parsed and
-    displayed in the \gui{Build Issues} output pane.
+    Qt Creator builds \c CMake Projects by running \c make, \c mingw32-make, or
+    \c nmake depending on your platform. The build errors and warnings are
+    parsed and displayed in the \gui{Build Issues} output pane.
 
     By default Qt Creator builds the \e{all} target. You can specify which
     targets to build in \gui{Project} mode, under \gui{Build Settings}.
@@ -1458,13 +1475,12 @@
     Qt Creator supports multiple build configurations. Also, the build
     directory can be modified after the initial import.
 
-
     \section1 Running CMake Projects
     Qt Creator automatically adds \gui{Run Configurations} for all targets
     specified in the \c CMake project file.
 
     Known issues for the current version can be found
-    \l{Known Issues of Version 1.2.93}{here}.
+    \l{Known Issues of Version 1.3.0}{here}.
 */
 
 
@@ -1592,31 +1608,27 @@
     For each detected S60 SDK with Qt, a special entry is made in the Qt Version Management settings
     \gui{Tools -> Options... -> Qt4 -> Qt Versions}.
 
-    \e{Note that you must use one of these special Qt version entries for building projects
-    for the emulator or devices. You can not just point Qt Creator to the qmake executable
-    like you would do for a desktop version of Qt.}
+    \e{Note that if you manually add a Qt version for Symbian, you must
+    also manually specify the S60 SDK to use for this version.}
 
     \image qtcreator-qt4-qtversions-win-symbian.png
 
     If you want to run your applications in the Symbian Emulator, you need to point Qt Creator
-    to the Metrowerks Compiler that you want to use, by setting the \gui{MWC Directory}
+    to the Metrowerks Compiler that you want to use, by setting the \gui{Carbide Directory}
     of the Qt version to the corresponding Carbide.c++ installation directory.
 
     You can check what S60 SDKs and corresponding Qt versions are found in the
     \gui{Tools -> Options... -> Qt4 -> S60 SDKs} preference page.
-    At the moment it is not possible to override the autodetected settings.
 
     \image qtcreator-qt4-s60sdks.png
 
-    \section2 Setting up Your Project
+    \section2 Building your Project
 
     After installing all the prerequisites and checking the setup in Qt Creator as described
     above, you need to make some settings for your project.
     \e{Note that the only supported build system for Qt for Symbian applications in Qt Creator
     is qmake.}
 
-    \section3 Building your Project
-
     Before you can build your project for the Symbian Platform you need to create build
     configurations for it.
     Open \gui{Projects mode} and make sure that your project is selected for editing in
@@ -1636,11 +1648,26 @@
 
     \image qtcreator-symbian-change-buildconfiguration.png
 
+    \section2 Running your Project
+
+    \section3 Running your Project in the Emulator
+
+    Similar to the build configuration setup for your project you need to create a run
+    configuration for running your project in the Symbian emulator: Switch to \gui{Projects mode}
+    and in \gui{Run Settings} you will find the \gui{Add -> YourApplication in Symbian Emulator}
+    button.
+
+    \image qtcreator-symbian-add-run-in-emulator.png
+
+    To start your project in the emulator select this run configuration as the active configuration
+    at the top of \gui{Projects mode} and press the run button.
+
+    \image qtcreator-symbian-change-run-in-emulator.png
+
     \section3 Running your Project on the Device
 
-    Similar to the build configuration setup for your project you need to create a run configuration
-    for running your project on a Symbian device. Add a new run configuration in \gui{Projects mode}
-    via \gui{Run Settings}, \gui{Add -> YourApplication on Symbian Device} button.
+    To run your project on a real Symbian device, just add another run configuration in
+    \gui{Projects mode} via \gui{Run Settings}, \gui{Add -> YourApplication on Symbian Device} button.
 
     \image qtcreator-symbian-add-runconfiguration.png
 
@@ -1656,11 +1683,19 @@
 
     \image qtcreator-symbian-change-runconfiguration.png
 
+    \section2 Troubleshooting
+
     When something goes wrong check the following things:
     \list
-        \o Is the device run configuration selected as the active run configuration?
-        \o Did you build your application with one of the special Qt versions created for the
-            S60 SDKs?
+        \o Did you build your application with a Qt version for Symbian?
+        \o Are the settings for the Qt version you use to build your project correct? Check the
+            path to the S60 SDK, and if you need to specify the path to your compiler tool chain.
+        \o Is the emulator/device run configuration selected as the active run configuration?
+        \o Did you build using the right toolchain, i. e. WINSCW for running in the Emulator,
+            GCCE or RVCT for running on the device?
+        \o If the emulator process could not be started, try closing Creator and starting the
+            application directly from your file manager. Having done this, Creator should be
+            able to run your projects in the Emulator.
         \o Is the device connected via USB in \e{PC Suite} mode?
         \o Is App TRK running on the device, using the USB connection, and does it have status
             \e{connected}?
@@ -1879,11 +1914,12 @@
         \row
             \o
                 \raw HTML
-                Auto-detected Qt
+                Qt in PATH
                 \endraw
                 \target glossary-system-qt
-            \o  The version of Qt installed on your system. This is the Qt
-                version for the \c qmake command found in your \c PATH.
+            \o  This is the Qt
+                version for the \c qmake command found in your \c PATH
+		environment variable.
 
         \row
             \o
@@ -1941,7 +1977,7 @@
         \o  Mac OS 10.4 and later
     \endlist
 
-    \note Building the sources requires \bold{Qt 4.5.0} or later.
+    \note Building the sources requires \bold{Qt 4.6.0} or later.
 */
 
 
@@ -1956,7 +1992,7 @@
     There are some known issues with Qt Creator.
     The development team is aware of those, there is no need to report them as bug.
 
-    \section1 Known Issues of Version 1.2.93
+    \section1 Known Issues of Version 1.3.0
 
     \list
         \o Debugging Helper do not work while doing On Device Debugging.
@@ -1967,7 +2003,15 @@
         \o Setting breakpoints in code that is compiled into the binary more
            than once does not work.
 
-           \endlist
+        \o On Linux and Windows, Installing Qt with one user account and
+        then using it with another requires other users to manually set
+        the Qt version. On Windows, setting the MinGW location is
+        required as well. The same applies to the location of GDB for Symbian.
+        A workaround is to copy %APPDATA%/Nokia/qtcreator.ini (Windows) or
+        $HOME/.config/Nokia/QtCreator.ini (Linux) from the directory
+        of the user who installed Creator to the other user.
+        This issues does not exist on Mac OS X.
+    \endlist
 
 
     \section1 Known Issues of Version 1.2.0 and 1.2.1

doc/qtcreator.qdocconf

@@ -19,16 +19,16 @@ sources.fileextensions  = "qtcreator.qdoc addressbook-sdk.qdoc"
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.1293
+qhp.QtCreator.namespace        = com.nokia.qtcreator.130
 qhp.QtCreator.virtualFolder    = doc
 qhp.QtCreator.indexTitle       = Qt Creator
 qhp.QtCreator.indexRoot        =
 qhp.QtCreator.extraFiles       = classic.css \
                           images/qt-logo.png \
                           images/qtcreator-screenshots.png
-qhp.QtCreator.filterAttributes = qtcreator 1.2.93
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.2.93
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.2.93
+qhp.QtCreator.filterAttributes = qtcreator 1.3.0
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.3.0
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.3.0
 
 # macros.qdocconf
 
@@ -211,5 +211,5 @@ HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
                           "<td width=\"40%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
-                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Creator 1.2.93</div></td>\n" \
+                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Creator 1.3.0</div></td>\n" \
                           "</tr></table></div></address>"

share/qtcreator/gdbmacros/gdbmacros.cpp

@@ -633,7 +633,7 @@ QDumper &QDumper::put(const void *p)
     if (p) {
         // Pointer is 'long long' on WIN_64, only
         static const char *printFormat = sizeof(quintptr) == sizeof(long) ? "0x%lx" : "0x%llx";
-        pos += sprintf(outBuffer + pos, printFormat, reinterpret_cast<uintptr_t>(p));
+        pos += sprintf(outBuffer + pos, printFormat, reinterpret_cast<quintptr>(p));
     } else {
         pos += sprintf(outBuffer + pos, "<null>");
     }
@@ -1069,7 +1069,7 @@ static void qDumpQAbstractItem(QDumper &d)
        static const char *printFormat = sizeof(quintptr) == sizeof(long) ?
                                         "%d,%d,0x%lx,0x%lx" : "%d,%d,0x%llx,0x%llx";
        sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c,
-	      reinterpret_cast<uintptr_t*>(&mm->p), reinterpret_cast<uintptr_t*>(&mm->m));
+	      reinterpret_cast<quintptr*>(&mm->p), reinterpret_cast<quintptr*>(&mm->m));
     }
     const QAbstractItemModel *m = mi.model();
     const int rowCount = m->rowCount(mi);
@@ -1640,7 +1640,7 @@ static void qDumpQList(QDumper &d)
     }
     qCheckAccess(pdata);
 
-    d.putItemCount("value", n);
+    d.putItemCount("value", nn);
     d.putItem("valueeditable", "false");
     d.putItem("numchild", n);
     if (d.dumpChildren) {

share/qtcreator/translations/qtcreator_es.ts

@@ -11067,8 +11067,8 @@ al control de versiones (%2)?</translation>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
-        <translation>Directorio de MinGw:</translation>
+        <source>MinGW Directory:</source>
+        <translation>Directorio de MinGW:</translation>
     </message>
     <message>
         <location/>
@@ -13301,7 +13301,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;número de línea&gt;</translation>
     </message>
 </context>

share/qtcreator/translations/qtcreator_it.ts

@@ -11037,8 +11037,8 @@ al VCS (%2)?</translation>
     </message>
     <message>
         <location/>
-        <source>MinGw Directory:</source>
-        <translation>Cartella MinGw:</translation>
+        <source>MinGW Directory:</source>
+        <translation>Cartella MinGW:</translation>
     </message>
     <message>
         <location/>
@@ -13272,7 +13272,7 @@ Queste codifiche dovrebbero andare bene:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;numero di riga&gt;</translation>
     </message>
 </context>

share/qtcreator/translations/translations.pro

 include(../../../qtcreator.pri)
 
-LANGUAGES = de es fr it ja pl ru
+LANGUAGES = de es fr it ja pl ru sl
 
 # var, prepend, append
 defineReplace(prependAll) {

src/app/Info.plist

@@ -184,8 +184,8 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.nokia.qtcreator</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.93</string>
+	<string>1.3.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.93</string>
+	<string>1.3.0</string>
 </dict>
 </plist>

src/libs/cplusplus/BackwardsScanner.cpp

@@ -131,6 +131,11 @@ int BackwardsScanner::previousBlockState(const QTextBlock &block) const
     return 0;
 }
 
+int BackwardsScanner::size() const
+{
+    return _tokens.size();
+}
+
 int BackwardsScanner::startOfMatchingBrace(int index) const
 {
     const BackwardsScanner &tk = *this;

src/libs/cplusplus/BackwardsScanner.h

@@ -69,6 +69,8 @@ public:
 
     int previousBlockState(const QTextBlock &block) const;
 
+    int size() const;
+
 private:
     const SimpleToken &fetchToken(int i);
 

src/libs/cplusplus/CppBindings.cpp

@@ -152,6 +152,25 @@ ClassBinding *NamespaceBinding::findClassBinding(Name *name, QSet<Binding *> *pr
     if (processed->contains(this))
         return 0;
 
+    if (const QualifiedNameId *q = name->asQualifiedNameId()) {
+        Binding *current = this;
+
+        for (unsigned i = 0; i < q->nameCount(); ++i) {
+            Identifier *nameId = q->nameAt(i)->identifier();
+            if (! nameId)
+                return 0;
+
+            QSet<Binding *> visited;
+            Binding *binding = current->findClassOrNamespaceBinding(nameId, &visited); // ### TODO: check recursion.
+            if (! binding)
+                return 0;
+
+            current = binding;
+        }
+
+        return current->asClassBinding();
+    }
+
     processed->insert(this);
 
     Identifier *id = name->identifier();

src/libs/cplusplus/CppDocument.cpp

@@ -42,6 +42,7 @@
 
 #include <QtCore/QByteArray>
 #include <QtCore/QBitArray>
+#include <QtCore/QDir>
 #include <QtCore/QtDebug>
 
 /*!
@@ -108,7 +109,7 @@ private:
 
 
 Document::Document(const QString &fileName)
-    : _fileName(fileName),
+    : _fileName(QDir::cleanPath(fileName)),
       _globalNamespace(0),
       _revision(0)
 {
@@ -147,6 +148,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;
@@ -163,7 +174,7 @@ QStringList Document::includedFiles() const
 
 void Document::addIncludeFile(const QString &fileName, unsigned line)
 {
-    _includes.append(Include(fileName, line));
+    _includes.append(Include(QDir::cleanPath(fileName), line));
 }
 
 void Document::appendMacro(const Macro &macro)
@@ -447,6 +458,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;
@@ -557,3 +570,8 @@ QStringList Snapshot::dependsOn(const QString &fileName) const
 
     return deps;
 }
+
+Document::Ptr Snapshot::value(const QString &fileName) const
+{
+    return QMap<QString, Document::Ptr>::value(QDir::cleanPath(fileName));
+}

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;
@@ -336,6 +341,7 @@ public:
     QStringList dependsOn(const QString &fileName) const;
 
     void insert(Document::Ptr doc);
+    Document::Ptr value(const QString &fileName) const;
 
     using _Base::insert;