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

Some compile fixes for new versions of Qt

Browse Source 
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>
This commit is contained in:
hjk
2023-08-23 13:57:30 +02:00
parent 850f1ce66c
commit 7054a2ae5f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/aspects.cpp
View File

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

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

@@ -352,7 +352,7 @@ 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(modulePrefix + '.') + subDir.fileName();
if (getDirectoryQmls(subDir).isEmpty()) { if (getDirectoryQmls(subDir).isEmpty()) {
generateImportCmake(subDir, prefix); generateImportCmake(subDir, prefix);