Merge remote-tracking branch 'origin/12.0'

Change-Id: I0ee9c73d7a7e12f98f88b161c35d00ada069cc9d
2023-11-21 14:46:01 +01:00
parent 8608dc9556 4f9cf826d6
commit c75a3bcd5d
13 changed files with 2835 additions and 988 deletions
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -299,7 +299,8 @@ bool CMakeBuildSystem::addFiles(Node *context, const FilePaths &filePaths, FileP
                                           targetCMakeFile.fileName().toStdString(),
                                           errorString)) {
                qCCritical(cmakeBuildSystemLog).noquote()
-                    << targetCMakeFile.path() << "failed to parse! Error:" << errorString;
+                    << targetCMakeFile.path() << "failed to parse! Error:"
+                    << QString::fromStdString(errorString);
                return false;
            }
        }