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

QbsProject: Compute uniqueProductName on the fly

Browse Source 
To simplify and fix cloning.

Change-Id: I380834710243f104635628b8d455219f0f73e67b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-11-22 16:36:21 +01:00
committed by Christian Kandeler
parent e037fe7e0c
commit 8e8890abc8
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -143,7 +143,6 @@ QbsRunConfiguration::QbsRunConfiguration(Target *target)
void QbsRunConfiguration::initialize(Core::Id id) void QbsRunConfiguration::initialize(Core::Id id)
{ {
RunConfiguration::initialize(id); RunConfiguration::initialize(id);
m_uniqueProductName = uniqueProductNameFromId(id);
setDefaultDisplayName(defaultDisplayName()); setDefaultDisplayName(defaultDisplayName());
installStepChanged(); installStepChanged();
@@ -215,7 +214,7 @@ Runnable QbsRunConfiguration::runnable() const
QString QbsRunConfiguration::executable() const QString QbsRunConfiguration::executable() const
{ {
QbsProject *pro = static_cast<QbsProject *>(target()->project()); QbsProject *pro = static_cast<QbsProject *>(target()->project());
const qbs::ProductData product = findProduct(pro->qbsProjectData(), m_uniqueProductName); const qbs::ProductData product = findProduct(pro->qbsProjectData(), uniqueProductName());
if (!product.isValid() || !pro->qbsProject().isValid()) if (!product.isValid() || !pro->qbsProject().isValid())
return QString(); return QString();
@@ -226,7 +225,7 @@ QString QbsRunConfiguration::executable() const
bool QbsRunConfiguration::isConsoleApplication() const bool QbsRunConfiguration::isConsoleApplication() const
{ {
QbsProject *pro = static_cast<QbsProject *>(target()->project()); QbsProject *pro = static_cast<QbsProject *>(target()->project());
const qbs::ProductData product = findProduct(pro->qbsProjectData(), m_uniqueProductName); const qbs::ProductData product = findProduct(pro->qbsProjectData(), uniqueProductName());
return product.properties().value(QLatin1String("consoleApplication"), false).toBool(); return product.properties().value(QLatin1String("consoleApplication"), false).toBool();
} }
@@ -242,7 +241,7 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
{ {
QbsProject *project = static_cast<QbsProject *>(target()->project()); QbsProject *project = static_cast<QbsProject *>(target()->project());
if (project && project->qbsProject().isValid()) { if (project && project->qbsProject().isValid()) {
const qbs::ProductData product = findProduct(project->qbsProjectData(), m_uniqueProductName); const qbs::ProductData product = findProduct(project->qbsProjectData(), uniqueProductName());
if (product.isValid()) { if (product.isValid()) {
QProcessEnvironment procEnv = env.toProcessEnvironment(); QProcessEnvironment procEnv = env.toProcessEnvironment();
procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), executable()); procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), executable());
@@ -274,7 +273,7 @@ QString QbsRunConfiguration::buildSystemTarget() const
QString QbsRunConfiguration::uniqueProductName() const QString QbsRunConfiguration::uniqueProductName() const
{ {
return m_uniqueProductName; return uniqueProductNameFromId(id());
} }
QString QbsRunConfiguration::defaultDisplayName() QString QbsRunConfiguration::defaultDisplayName()

2
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
View File

@@ -79,8 +79,6 @@ private:
void updateTarget(); void updateTarget();
QString m_uniqueProductName;
QbsInstallStep *m_currentInstallStep = nullptr; // We do not take ownership! QbsInstallStep *m_currentInstallStep = nullptr; // We do not take ownership!
ProjectExplorer::BuildStepList *m_currentBuildStepList = nullptr; // We do not take ownership! ProjectExplorer::BuildStepList *m_currentBuildStepList = nullptr; // We do not take ownership!
}; };