feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProjectManager: Compile fix after Qt source compatibility break

Browse Source 
error: operands to '?:' have different types 'QStringBuilder<const QString&, QString>' and 'QStringBuilder<QString, QString>'

Caused by af8f9a2a6e3dbc8.

Change-Id: Ib3dfca2cb5f1cb1855f25d178f63898eb6745c46
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-06-22 13:18:46 +02:00
parent 35e9b13e15
commit bf46b4d557
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
View File

@@ -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 {