Merge remote-tracking branch 'origin/11.0' into qds/dev

Conflicts: src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
  tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp

Change-Id: I257f1908917bcc58805619b53b6866f2f73ca544

tests/unit/unittest/CMakeLists.txt

@@ -26,7 +26,7 @@ add_qtc_test(unittest GTEST
   DEPENDS
     Qt::Core Qt::Network Qt::Widgets
     Qt::Xml Qt::Concurrent Qt::QmlPrivate Qt::Gui
-    Qt6Core5Compat QmlJS Sqlite SqliteC
+    Qt::Core5Compat QmlJS Sqlite SqliteC
     Googletest
   DEFINES
     GTEST_INTERNAL_HAS_STRING_VIEW
@@ -43,7 +43,6 @@ add_qtc_test(unittest GTEST
     QDS_USE_PROJECTSTORAGE
   SOURCES
     abstractviewmock.h
-    compare-operators.h
     conditionally-disabled-tests.h
     dynamicastmatcherdiagnosticcontainer-matcher.h
     eventspy.cpp eventspy.h
@@ -343,15 +342,6 @@ endif()
 
 extend_qtc_test(unittest DEPENDS Utils CPlusPlus)
 
-extend_qtc_test(unittest
-  SOURCES_PREFIX ../../../src/plugins/coreplugin
-  DEFINES CORE_STATIC_LIBRARY
-  SOURCES
-    coreicons.cpp coreicons.h
-    find/ifindfilter.cpp find/ifindfilter.h
-    locator/ilocatorfilter.cpp locator/ilocatorfilter.h
-)
-
 extend_qtc_test(unittest
   CONDITION TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate AND Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0  AND Qt6_VERSION VERSION_LESS 6.6.0
   DEPENDS Qt6::QmlDomPrivate Qt6::QmlCompilerPrivate

tests/unit/unittest/compare-operators.h

@@ -1,25 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <coreplugin/find/searchresultitem.h>
-
-namespace Core {
-namespace Search {
-
-inline
-bool operator==(const TextPosition first, class TextPosition second)
-{
-    return first.line == second.line
-        && first.column == second.column;
-}
-
-inline
-bool operator==(const TextRange first, class TextRange second)
-{
-    return first.begin == second.begin
-        && first.end == second.end;
-}
-}
-}

tests/unit/unittest/externaldependenciesmock.h

@@ -7,8 +7,6 @@
 
 #include <externaldependenciesinterface.h>
 
-#include <QUrl>
-
 class ExternalDependenciesMock : public QmlDesigner::ExternalDependenciesInterface
 {
 public:

tests/unit/unittest/googletest.h

@@ -13,8 +13,6 @@
 #include <gtest/gtest-printers.h>
 #include <gtest/gtest-typed-test.h>
 
-#include "compare-operators.h"
-
 #include "conditionally-disabled-tests.h"
 #include "gtest-creator-printing.h"
 #include "gtest-llvm-printing.h"

tests/unit/unittest/gtest-creator-printing.cpp

@@ -22,7 +22,6 @@
 #include <sqlitesessionchangeset.h>
 #include <sqlitevalue.h>
 #include <utils/fileutils.h>
-#include <utils/linecolumn.h>
 #include <variantproperty.h>
 #include <qmldesigner/designercore/imagecache/imagecachestorageinterface.h>
 
@@ -43,11 +42,6 @@ std::ostream &operator<<(std::ostream &out, const monostate &)
 } // namespace std
 
 namespace Utils {
-
-std::ostream &operator<<(std::ostream &out, const LineColumn &lineColumn)
-{
-    return out << "(" << lineColumn.line << ", " << lineColumn.column << ")";
-}
 namespace {
 const char * toText(Utils::Language language)
 {

tests/unit/unittest/gtest-creator-printing.h

@@ -73,7 +73,6 @@ class LineColumn;
 class SmallStringView;
 class FilePath;
 
-std::ostream &operator<<(std::ostream &out, const LineColumn &lineColumn);
 std::ostream &operator<<(std::ostream &out, const Utils::Language &language);
 std::ostream &operator<<(std::ostream &out, const Utils::LanguageVersion &languageVersion);
 std::ostream &operator<<(std::ostream &out, const Utils::LanguageExtension &languageExtension);

tests/unit/unittest/sqlitedatabasemock.h

@@ -28,7 +28,7 @@ public:
 
     MOCK_METHOD(void, prepare, (Utils::SmallStringView sqlStatement), ());
 
-    MOCK_METHOD(void, execute, (Utils::SmallStringView sqlStatement), ());
+    MOCK_METHOD(void, execute, (Utils::SmallStringView sqlStatement), (override));
 
     MOCK_METHOD(int64_t, lastInsertedRowId, (), (const));
 

tests/unit/unittest/sqlitereadwritestatementmock.h

@@ -43,7 +43,7 @@ public:
                 ());
 
     template<typename ResultType, typename... QueryTypes>
-    auto optionalValue(const QueryTypes &...queryValues)
+    auto optionalValue([[maybe_unused]] const QueryTypes &...queryValues)
     {
             static_assert(!std::is_same_v<ResultType, ResultType>,
                           "SqliteReadStatementMock::value does not handle result type!");