From bf46b4d557deda0b88dd3b3a54c297d59720f4e9 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 22 Jun 2023 13:18:46 +0200 Subject: [PATCH] QmlProjectManager: Compile fix after Qt source compatibility break error: operands to '?:' have different types 'QStringBuilder' and 'QStringBuilder' Caused by af8f9a2a6e3dbc8. Change-Id: Ib3dfca2cb5f1cb1855f25d178f63898eb6745c46 Reviewed-by: Reviewed-by: Eike Ziller --- src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp index a9f35c2c5e2..5a3bedf098a 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp @@ -360,8 +360,8 @@ 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()) : + QString(QString(modulePrefix + '.') + subDir.fileName()); if (getDirectoryQmls(subDir).isEmpty()) { generateImportCmake(subDir, prefix); } else {