From 9703f2e948183aa83c5dbd614bcb087ff134aa42 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 5 Jul 2019 09:56:23 +0200
Subject: CppTools: Avoid some deprecation warnings

Change-Id: I0726bbcf9fd3992312e5980bd176ce85903f27a9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 src/plugins/cpptools/cpptoolstestcase.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins/cpptools')

diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 5ed334b2e8..22e2567b44 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();
-- 
cgit v1.2.1


From 69d8b7f739b2104f4b776e6bfecc81cdacf01f33 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Fri, 5 Jul 2019 12:17:17 +0200
Subject: Clang: Fix tidy checks

generateClangTidyChecks.py generated funny output as it was not
considering new major categories.

Fixes: QTCREATORBUG-22450
Change-Id: Ibd6d0cc7539c9fb846caacbe936770d0c960f04f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/cpptools/cpptools_clangtidychecks.h | 37 +++++++++++++++++--------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'src/plugins/cpptools')

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"
             }
         }
     }
-- 
cgit v1.2.1


From 51cd2885ef56d43b8f421046fab6e5f85f8e6484 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Thu, 11 Jul 2019 13:08:52 +0200
Subject: CppTools: Allow enabling debugging of locator filter tests by
 environment

Change-Id: I9786b7c6959b77eebb1bc774d2e7bd4c8ed3edeb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/cpptools/cpplocatorfilter_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugins/cpptools')

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/")
 
-- 
cgit v1.2.1