diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-08-31 09:58:40 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-08-31 10:53:21 +0200 |
| commit | 9f7a2194f7fd7a453acaa1d96b3c7a3ba571f044 (patch) | |
| tree | 6a2d7123828bbbda2a0ddf52066eb2cb29bbbd47 /src/plugins/cpptools/cppmodelmanager.h | |
| parent | 7bc8dd18a3f9a81f11ad993bb6b3219ddb6af56f (diff) | |
| download | qt-creator-9f7a2194f7fd7a453acaa1d96b3c7a3ba571f044.tar.gz | |
QmlJS: Fix infinite loop when scanning for exported C++ types.
Setting extra diagnostics would call updateDocument which would in turn
trigger another scan.
Change-Id: I3810a380cdf716a12767d94ff82dc30f8ae3954d
Reviewed-on: http://codereview.qt.nokia.com/3917
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.h')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 4bc06f60f0..5909fffe3c 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -150,6 +150,7 @@ public Q_SLOTS: private Q_SLOTS: // this should be executed in the GUI thread. void onDocumentUpdated(CPlusPlus::Document::Ptr doc); + void onExtraDiagnosticsUpdated(const QString &fileName); void onAboutToRemoveProject(ProjectExplorer::Project *project); void onAboutToUnloadSession(); void onProjectAdded(ProjectExplorer::Project *project); @@ -157,6 +158,8 @@ private Q_SLOTS: void updateEditorSelections(); private: + void updateEditor(CPlusPlus::Document::Ptr doc); + WorkingCopy buildWorkingCopyList(); QStringList projectFiles() |