diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp index c216ee320ba..04bd26476e2 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.cpp @@ -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(); diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.h b/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.h index 30e85d53dcd..78b038b0378 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.h +++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/qmlprojectitem.h @@ -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); diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp index e06ac211dfb..712aef92277 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp @@ -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(); diff --git a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h index 914b8d4c0fe..d275481f537 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h +++ b/src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.h @@ -57,6 +57,7 @@ public: Utils::FilePath canonicalProjectDir() const; QString mainFile() const; + QString mainUiFile() const; Utils::FilePath mainFilePath() const; Utils::FilePath mainUiFilePath() const;