diff --git a/src/libs/sqlite/sqlitebasestatement.h b/src/libs/sqlite/sqlitebasestatement.h
index a41be5f4822..4da0cefa7fb 100644
--- a/src/libs/sqlite/sqlitebasestatement.h
+++ b/src/libs/sqlite/sqlitebasestatement.h
@@ -411,10 +411,6 @@ public:
 
         BaseSqliteResultRange(BaseSqliteResultRange &) = delete;
         BaseSqliteResultRange &operator=(BaseSqliteResultRange &) = delete;
-
-        BaseSqliteResultRange(BaseSqliteResultRange &&other)
-            : m_statement{std::move(other.resetter)}
-        {}
         BaseSqliteResultRange &operator=(BaseSqliteResultRange &&) = delete;
 
         iterator begin() & { return iterator{m_statement}; }
diff --git a/src/libs/sqlite/sqliteids.h b/src/libs/sqlite/sqliteids.h
index 4816cd67d7c..7e4f5de4baa 100644
--- a/src/libs/sqlite/sqliteids.h
+++ b/src/libs/sqlite/sqliteids.h
@@ -147,7 +147,7 @@ public:
     friend void convertToString(String &string, CompoundBasicId id)
     {
         convertToString(string, id.id);
-        convertToString(string, id.contextId);
+        convertToString(string, id.contextId());
     }
 
     friend bool compareId(CompoundBasicId first, CompoundBasicId second)
diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h
index f173f9844a5..6814f935237 100644
--- a/src/libs/utils/algorithm.h
+++ b/src/libs/utils/algorithm.h
@@ -258,7 +258,7 @@ template<template<typename> class C, // result container type
          typename Result = std::decay_t<std::invoke_result_t<F, Value&>>,
          typename ResultContainer = C<Result>>
 Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
-#ifdef Q_CC_CLANG
+#if __cpp_template_template_args < 201611L
 // "Matching of template template-arguments excludes compatible templates"
 // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html (P0522R0)
 // in C++17 makes the above match e.g. C=std::vector even though that takes two
@@ -833,7 +833,7 @@ Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function)
     return transform<ResultContainer>(std::forward<SC>(container), function);
 }
 
-#ifdef Q_CC_CLANG
+#if __cpp_template_template_args < 201611L
 template<template<typename, typename> class C, // result container type
          typename SC,                          // input container type
          typename F,                           // function type