Merge commit 'origin/1.3'

2009-10-26 15:48:26 +01:00
parent 441ece365a 4091efb47f
commit bac9c64f93
26 changed files with 370 additions and 173 deletions
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -687,7 +687,7 @@ void Qt4Project::updateCodeModel()
            pinfo.includePaths == allIncludePaths     &&
            pinfo.frameworkPaths == allFrameworkPaths &&
            pinfo.sourceFiles == files) {
-        modelmanager->updateProjectInfo(pinfo);
+        // Nothing to update...
    } else {
        if (pinfo.defines != predefinedMacros         ||
            pinfo.includePaths != allIncludePaths     ||