Merge remote-tracking branch 'origin/4.10'

Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
This commit is contained in:
Tim Jenssen
2019-07-12 15:53:56 +02:00
126 changed files with 9456 additions and 6532 deletions

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 {