feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppquickfix_test.cpp
	src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: I392229af933c1e56b9ea459d4d240a2144b4bfcb
This commit is contained in:
Eike Ziller
2013-10-01 10:04:18 +02:00
parent 1d23165922 d9602ca550
commit a0b2d10822
8 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cppeditor/cppquickfix_test.cpp
View File

@@ -34,11 +34,11 @@
#include "cppquickfixassistant.h"
#include "cppquickfixes.h"
#include <cpptools/cpppreprocessertesthelper.h>
#include <coreplugin/plugintestutils.h>
#include <cpptools/cppcodestylepreferences.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cpppreprocessor.h>
#include <cpptools/cpppreprocessertesthelper.h>
#include <cpptools/cpptoolssettings.h>
#include <cpptools/includeutils.h>
@@ -239,6 +239,7 @@ void TestCase::init(const QStringList &includePaths)
// Rehighlight
testFile->editorWidget->semanticRehighlight(true);
// Wait for the semantic info from the future
while (testFile->editorWidget->semanticInfo().doc.isNull())
QCoreApplication::processEvents();
@@ -264,8 +265,7 @@ TestCase::~TestCase()
if (testFile->editor)
editorsToClose << testFile->editor;
}
EditorManager::closeEditors(editorsToClose, false);
QCoreApplication::processEvents(); // process any pending events
Core::Tests::closeAndDeleteEditors(editorsToClose);
// Remove the test files from the code-model
CppModelManagerInterface *mmi = CppModelManagerInterface::instance();