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/buildsystem/qmlbuildsystem.cpp
View File

@@ -2,7 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "qmlbuildsystem.h"
#include "../qmlprojectconstants.h"
#include "../qmlprojectmanagertr.h"
#include <QtCore5Compat/qtextcodec.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
@@ -222,7 +224,7 @@ void QmlBuildSystem::parseProjectFiles()
QString errorMessage;
if (!reader.fetch(mainFilePath, &errorMessage)) {
Core::MessageManager::writeFlashing(
tr("Warning while loading project file %1.").arg(projectFilePath().toUserOutput()));
Tr::tr("Warning while loading project file %1.").arg(projectFilePath().toUserOutput()));
Core::MessageManager::writeSilently(errorMessage);
}
}

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 {

3
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -197,7 +197,8 @@ Tasks QmlProject::projectIssues(const Kit *k) const
if (version->type() == QtSupport::Constants::DESKTOPQT) {
if (version->qmlRuntimeFilePath().isEmpty()) {
result.append(
createProjectTask(Task::TaskType::Error, tr("Qt version has no QML utility.")));
createProjectTask(Task::TaskType::Error,
Tr::tr("Qt version has no QML utility.")));
}
} else {
// Non-desktop Qt on a desktop device? We don't support that.

5
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -217,7 +217,10 @@ FilePath QmlProjectRunConfiguration::qmlRuntimeFilePath() const
// i.e. not necessarily something the device can use, but the
// device had its chance above.
if (QtVersion *version = QtKitAspect::qtVersion(kit)) {
if (version->qtVersion().majorVersion() > 5) {
// look for puppet as qmlruntime only in QtStudio Qt versions
if (version->features().contains("QtStudio") &&
version->qtVersion().majorVersion() > 5) {
auto [workingDirectoryPath, puppetPath] = QmlDesigner::QmlPuppetPaths::qmlPuppetPaths(
target(), QmlDesigner::QmlDesignerBasePlugin::settings());
if (!puppetPath.isEmpty()) {