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

Merge remote-tracking branch 'origin/11.0' into qds/dev

Browse Source 
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e
This commit is contained in:
Tim Jenssen
2023-06-22 16:49:37 +02:00
parent dfe7789506 c3fd118c62
commit 846f8dba92
466 changed files with 5238 additions and 5077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,8 +388,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 {