forked from qt-creator/qt-creator
QmlProjectManager: Compile fix after Qt source compatibility break
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:
@@ -360,8 +360,8 @@ void CmakeFileGenerator::generateImportCmake(const FilePath &dir, const QString
|
|||||||
continue;
|
continue;
|
||||||
fileContent.append(QString(ADD_SUBDIR).arg(subDir.fileName()));
|
fileContent.append(QString(ADD_SUBDIR).arg(subDir.fileName()));
|
||||||
QString prefix = modulePrefix.isEmpty() ?
|
QString prefix = modulePrefix.isEmpty() ?
|
||||||
modulePrefix % subDir.fileName() :
|
QString(modulePrefix % subDir.fileName()) :
|
||||||
QString(modulePrefix + '.') + subDir.fileName();
|
QString(QString(modulePrefix + '.') + subDir.fileName());
|
||||||
if (getDirectoryQmls(subDir).isEmpty()) {
|
if (getDirectoryQmls(subDir).isEmpty()) {
|
||||||
generateImportCmake(subDir, prefix);
|
generateImportCmake(subDir, prefix);
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user