Merge remote-tracking branch 'origin/10.0'

Change-Id: Iff4973fc4116122bcaa7aa9434294dba875ef56a
2023-02-14 13:08:27 +02:00
parent 6383146b0e b4f665f8ac
commit 6a0a4ac5e4
303 changed files with 5518 additions and 6428 deletions
--- a/src/plugins/genericprojectmanager/genericprojectmanagertr.h
+++ b/src/plugins/genericprojectmanager/genericprojectmanagertr.h
@@ -9,7 +9,7 @@ namespace GenericProjectManager {

 struct Tr
 {
-    Q_DECLARE_TR_FUNCTIONS(::GenericProjectManager)
+    Q_DECLARE_TR_FUNCTIONS(QtC::GenericProjectManager)
 };

 } // namespace GenericProjectManager
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -21,7 +21,6 @@
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/selectablefilesmodel.h>
-#include <projectexplorer/taskhub.h>

 #include <utils/algorithm.h>
 #include <utils/fileutils.h>