Merge remote-tracking branch 'origin/4.10'

Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728

src/plugins/clangcodemodel/clangcompletioncontextanalyzer.cpp

@@ -168,6 +168,7 @@ void ClangCompletionContextAnalyzer::handleFunctionCall(int afterOperatorPositio
         } else {
             const int functionNameStart = startOfFunctionCall(afterOperatorPosition);
             if (functionNameStart >= 0) {
+                m_addSnippets = functionNameStart == afterOperatorPosition;
                 // Always pass the position right after '(' to libclang because
                 // positions after the comma might be problematic if a preceding
                 // argument is invalid code.

src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp

@@ -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 {

src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp

@@ -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 {