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 IntegersAspect::value() const void IntegersAspect::setValue(const QList &value) { - BaseAspect::setValue(transform(value, &QVariant::fromValue)); + BaseAspect::setValue(transform(value, [](int x) { return QVariant::fromValue(x); })); } QList IntegersAspect::defaultValue() const @@ -2174,7 +2174,7 @@ QList IntegersAspect::defaultValue() const void IntegersAspect::setDefaultValue(const QList &value) { - BaseAspect::setDefaultValue(transform(value, &QVariant::fromValue)); + 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);