From 7054a2ae5f899c1f50da09b7b2366721ccd307fa Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 23 Aug 2023 13:57:30 +0200
Subject: [PATCH] Some compile fixes for new versions of Qt

For easier regression testing.

Change-Id: I9609f35912c4c1b38ee699cf009a198483853f2a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/utils/aspects.cpp                                    | 4 ++--
 src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 72e667d76a6..4f71e7bd6d8 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -2163,7 +2163,7 @@ QList<int> IntegersAspect::value() const
 
 void IntegersAspect::setValue(const QList<int> &value)
 {
-    BaseAspect::setValue(transform(value, &QVariant::fromValue<int>));
+    BaseAspect::setValue(transform(value, [](int x) { return QVariant::fromValue(x); }));
 }
 
 QList<int> IntegersAspect::defaultValue() const
@@ -2174,7 +2174,7 @@ QList<int> IntegersAspect::defaultValue() const
 
 void IntegersAspect::setDefaultValue(const QList<int> &value)
 {
-    BaseAspect::setDefaultValue(transform(value, &QVariant::fromValue<int>));
+    BaseAspect::setDefaultValue(transform(value, [](int x) { return QVariant::fromValue(x); }));
 }
 
 
diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
index ef83206d982..4175f3949e4 100644
--- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
+++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
@@ -352,7 +352,7 @@ void CmakeFileGenerator::generateImportCmake(const FilePath &dir, const QString
             continue;
         fileContent.append(QString(ADD_SUBDIR).arg(subDir.fileName()));
         QString prefix = modulePrefix.isEmpty() ?
-                modulePrefix % subDir.fileName() :
+                QString(modulePrefix % subDir.fileName()) :
                 QString(modulePrefix + '.') + subDir.fileName();
         if (getDirectoryQmls(subDir).isEmpty()) {
             generateImportCmake(subDir, prefix);