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

QmlProject: Fix mainUiFilePath()

Browse Source 
The method mainUiFilePath() is supposed to return the actual file path
that is relative to the project file.
Removing mainUiFilePath() from QmlProjectItem, since QmlProjectItem
is supposed to contain only the pure data.

Task-number: QDS-9650
Change-Id: Iad474586cad8f8cef745aadb63d421573d7d9c83
(cherry picked from commit 7c7a0fba57788875066e7f0180f1e570ee93033f)
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2023-04-27 14:09:09 +02:00
parent 6fd6fc7234
commit 3850b6c981
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp
View File

@@ -317,11 +317,6 @@ QString QmlProjectItem::mainFile() const
return m_project["runConfig"].toObject()["mainFile"].toString();
}
Utils::FilePath QmlProjectItem::mainFilePath() const
{
return m_projectFile;
}
void QmlProjectItem::setMainUiFile(const QString &mainUiFile)
{
QJsonObject runConfig = m_project["runConfig"].toObject();
@@ -334,11 +329,6 @@ QString QmlProjectItem::mainUiFile() const
return m_project["runConfig"].toObject()["mainUiFile"].toString();
}
Utils::FilePath QmlProjectItem::mainUiFilePath() const
{
return Utils::FilePath::fromString(m_project["runConfig"].toObject()["mainUiFile"].toString());
}
bool QmlProjectItem::widgetApp() const
{
return m_project["runConfig"].toObject()["widgetApp"].toBool();

2
src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.h
View File

@@ -69,11 +69,9 @@ public:
void setMainFile(const QString &mainFile);
QString mainFile() const;
Utils::FilePath mainFilePath() const;
void setMainUiFile(const QString &mainUiFile);
QString mainUiFile() const;
Utils::FilePath mainUiFilePath() const;
bool widgetApp() const;
void setWidgetApp(const bool &widgetApp);

7
src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp
View File

@@ -291,7 +291,7 @@ Utils::FilePath QmlBuildSystem::mainFilePath() const
Utils::FilePath QmlBuildSystem::mainUiFilePath() const
{
return m_projectItem->mainUiFilePath();
return projectDirectory().pathAppended(mainUiFile());
}
bool QmlBuildSystem::setMainFileInProjectFile(const Utils::FilePath &newMainFilePath)
@@ -477,6 +477,11 @@ QString QmlBuildSystem::mainFile() const
return m_projectItem->mainFile();
}
QString QmlBuildSystem::mainUiFile() const
{
return m_projectItem->mainUiFile();
}
bool QmlBuildSystem::qtForMCUs() const
{
return m_projectItem->isQt4McuProject();

1
src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h
View File

@@ -57,6 +57,7 @@ public:
Utils::FilePath canonicalProjectDir() const;
QString mainFile() const;
QString mainUiFile() const;
Utils::FilePath mainFilePath() const;
Utils::FilePath mainUiFilePath() const;