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

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Change-Id: I565a0bd783dc80b53d4715fdc153dba1f1d3f7c7
This commit is contained in:
Eike Ziller
2020-10-05 09:05:23 +02:00
parent 48c56416f5 2f584585e3
commit ad7dbc4619
31 changed files with 468 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/designer/gotoslot_test.cpp
View File

@@ -177,9 +177,11 @@ public:
// Wait for updated documents
for (TextEditor::BaseTextEditor *editor : qAsConst(editors)) {
QElapsedTimer t;
t.start();
const QString filePath = editor->document()->filePath().toString();
if (auto parser = BuiltinEditorDocumentParser::get(filePath)) {
forever {
while (t.elapsed() < 2000) {
if (Document::Ptr document = parser->document()) {
if (document->editorRevision() == 2)
break;
@@ -193,6 +195,7 @@ public:
const auto cppDocumentParser = BuiltinEditorDocumentParser::get(cppFile);
QVERIFY(cppDocumentParser);
const Document::Ptr cppDocument = cppDocumentParser->document();
QCOMPARE(cppDocument->editorRevision(), 2);
QVERIFY(checkDiagsnosticMessages(cppDocument));
const auto hDocumentParser = BuiltinEditorDocumentParser::get(hFile);