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

ProjectExplorer: Introduce a ProjectConfiguration::kit() function

Browse Source 
For convenience, and use it in some places.

Change-Id: I8f7cb502b37b2fbf4cf2d17cac9c6299558332dc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-07 15:56:18 +02:00
parent 552a1296fe
commit 61bfd32438
34 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,7 @@ void QmlBuildSystem::setMainFile(const QString &mainFilePath)
Utils::FilePath QmlBuildSystem::targetDirectory() const
{
if (DeviceTypeKitAspect::deviceTypeId(target()->kit())
if (DeviceTypeKitAspect::deviceTypeId(kit())
== ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE)
return canonicalProjectDir();
@@ -389,7 +389,7 @@ void QmlBuildSystem::updateDeploymentData()
if (!m_projectItem)
return;
if (DeviceTypeKitAspect::deviceTypeId(target()->kit())
if (DeviceTypeKitAspect::deviceTypeId(kit())
== ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
return;
}

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

@@ -157,7 +157,7 @@ QString QmlProjectRunConfiguration::disabledReason() const
return tr("No script file to execute.");
const FilePath viewer = qmlScenePath();
if (DeviceTypeKitAspect::deviceTypeId(target()->kit())
if (DeviceTypeKitAspect::deviceTypeId(kit())
== ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE
&& !viewer.exists()) {
return tr("No qmlscene found.");
@@ -198,7 +198,7 @@ QString QmlProjectRunConfiguration::commandLineArguments() const
{
// arguments in .user file
QString args = aspect<ArgumentsAspect>()->arguments(macroExpander());
const IDevice::ConstPtr device = DeviceKitAspect::device(target()->kit());
const IDevice::ConstPtr device = DeviceKitAspect::device(kit());
const OsType osType = device ? device->osType() : HostOsInfo::hostOs();
// arguments from .qmlproject file