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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
This commit is contained in:
Tim Jenssen
2019-07-12 15:53:56 +02:00
parent f7520b7d99 51cd2885ef
commit 333b33edbe
126 changed files with 9456 additions and 6532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
View File

@@ -50,6 +50,7 @@
#include <utils/qtcassert.h>
#include <QDebug>
#include <QElapsedTimer>
#include <QFileInfo>
#include <QLoggingCategory>
#include <QSharedPointer>
@@ -302,7 +303,7 @@ WaitForUpdatedCodeWarnings::WaitForUpdatedCodeWarnings(ClangEditorDocumentProces
bool WaitForUpdatedCodeWarnings::wait(int timeOutInMs) const
{
QTime time;
QElapsedTimer time;
time.start();
forever {
@@ -580,7 +581,7 @@ bool ProcessEventsCommand::run()
{
qCDebug(debug) << "line" << context().lineNumber << "ProcessEventsCommand" << m_durationInMs;
QTime time;
QElapsedTimer time;
time.start();
forever {

8
src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
View File

@@ -226,7 +226,7 @@ bool OpenEditorAtCursorPosition::waitUntilProjectPartChanged(const QString &newP
bool OpenEditorAtCursorPosition::waitUntil(const std::function<bool ()> &condition, int timeout)
{
QTime time;
QElapsedTimer time;
time.start();
forever {
@@ -432,7 +432,7 @@ bool MonitorGeneratedUiFile::waitUntilGenerated(int timeout) const
if (m_isGenerated)
return true;
QTime time;
QElapsedTimer time;
time.start();
forever {
@@ -472,10 +472,10 @@ public:
{
QTC_ASSERT(writeFile(m_filePath, m_fileContents), return false);
QTime totalTime;
QElapsedTimer totalTime;
totalTime.start();
QTime writeFileAgainTime;
QElapsedTimer writeFileAgainTime;
writeFileAgainTime.start();
forever {