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

allow out of tree cmake deployment configurations

Browse Source 
Change-Id: I78c7e46372ea7a5c1651c420f66c0ce6326d7297
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Volker Vogelhuber
2014-11-13 09:26:13 +01:00
parent c40d9e9d17
commit 779f38bded
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -674,10 +674,14 @@ void CMakeProject::updateApplicationAndDeploymentTargets()
QFile deploymentFile;
QTextStream deploymentStream;
QString deploymentPrefix;
QDir sourceDir;
sourceDir.setPath(t->project()->projectDirectory().toString());
QDir sourceDir(t->project()->projectDirectory().toString());
QDir buildDir(t->activeBuildConfiguration()->buildDirectory().toString());
deploymentFile.setFileName(sourceDir.filePath(QLatin1String("QtCreatorDeployment.txt")));
// If we don't have a global QtCreatorDeployment.txt check for one created by the active build configuration
if (!deploymentFile.exists())
deploymentFile.setFileName(buildDir.filePath(QLatin1String("QtCreatorDeployment.txt")));
if (deploymentFile.open(QFile::ReadOnly | QFile::Text)) {
deploymentStream.setDevice(&deploymentFile);
deploymentPrefix = deploymentStream.readLine();
@@ -687,7 +691,7 @@ void CMakeProject::updateApplicationAndDeploymentTargets()
BuildTargetInfoList appTargetList;
DeploymentData deploymentData;
QDir buildDir(t->activeBuildConfiguration()->buildDirectory().toString());
foreach (const CMakeBuildTarget &ct, m_buildTargets) {
if (ct.executable.isEmpty())
continue;