Merge remote-tracking branch 'origin/4.10'

Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728

3 files changed, 31 insertions, 16 deletions

diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp
index 0dd3470826..482c89b5b1 100644
--- a/src/plugins/cpptools/cpplocatorfilter_test.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp
@@ -50,7 +50,7 @@ using namespace Utils;
 
 namespace {
 
-enum { debug = 0 };
+const bool debug = qEnvironmentVariable("QTC_DEBUG_CPPLOCATORFILTERTESTCASE") == "1";
 
 QTC_DECLARE_MYTESTDATADIR("../../../tests/cpplocators/")
 
diff --git a/src/plugins/cpptools/cpptools_clangtidychecks.h b/src/plugins/cpptools/cpptools_clangtidychecks.h
index 813e9b9ed5..7178b3aa92 100644
--- a/src/plugins/cpptools/cpptools_clangtidychecks.h
+++ b/src/plugins/cpptools/cpptools_clangtidychecks.h
@@ -48,10 +48,10 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
     "",
     {
         {
-            "android-",
+            "abseil-",
             {
                 {
-                    "uration-",
+                    "duration-",
                     {
                         "comparison",
                         "division",
@@ -65,18 +65,23 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                         "subtraction"
                     }
                 },
-                "aster-strsplit-delimiter",
+                "faster-strsplit-delimiter",
                 {
-                    "o-",
+                    "no-",
                     {
                         "internal-dependencies",
                         "namespace"
                     }
                 },
-                "edundant-strcat-calls",
-                "tr-cat-append",
-                "tring-find-startswith",
-                "pgrade-duration-conversions",
+                "redundant-strcat-calls",
+                "str-cat-append",
+                "string-find-startswith",
+                "upgrade-duration-conversions"
+            }
+        },
+        {
+            "android-",
+            {
                 {
                     "cloexec-",
                     {
@@ -715,7 +720,12 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                         "copy-initialization",
                         "value-param"
                     }
-                },
+                }
+            }
+        },
+        {
+            "portability-",
+            {
                 "simd-intrinsics"
             }
         },
@@ -773,8 +783,13 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                 },
                 "string-compare",
                 "uniqueptr-delete-release",
-                "uppercase-literal-suffix",
-                "rary-objects"
+                "uppercase-literal-suffix"
+            }
+        },
+        {
+            "zircon-",
+            {
+                "temporary-objects"
             }
         }
     }
diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 72dfa8551c..b9ba701aeb 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -146,7 +146,7 @@ static bool waitForProcessedEditorDocument_internal(CppEditorDocumentHandle *edi
 {
     QTC_ASSERT(editorDocument, return false);
 
-    QTime timer;
+    QElapsedTimer timer;
     timer.start();
 
     forever {
@@ -208,7 +208,7 @@ CPlusPlus::Document::Ptr TestCase::waitForFileInGlobalSnapshot(const QString &fi
 QList<CPlusPlus::Document::Ptr> TestCase::waitForFilesInGlobalSnapshot(const QStringList &filePaths,
                                                                        int timeOutInMs)
 {
-    QTime t;
+    QElapsedTimer t;
     t.start();
 
     QList<CPlusPlus::Document::Ptr> result;
@@ -231,7 +231,7 @@ bool TestCase::waitUntilCppModelManagerIsAwareOf(Project *project, int timeOutIn
     if (!project)
         return false;
 
-    QTime t;
+    QElapsedTimer t;
     t.start();
 
     CppModelManager *modelManager = CppModelManager::instance();
@@ -275,7 +275,7 @@ ProjectOpenerAndCloser::~ProjectOpenerAndCloser()
     foreach (Project *project, m_openProjects)
         ProjectExplorerPlugin::unloadProject(project);
 
-    QTime t;
+    QElapsedTimer t;
     t.start();
     while (!hasGcFinished && t.elapsed() <= 30000)
         QCoreApplication::processEvents();