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

Move evaluation of QtCreatorDeploymentData.txt to ProjectExplorer

Browse Source 
We want to re-use it outside of the CMakeProjectManager.

Change-Id: I7550f86704bb7c2a683e831cf8827d5b0f6d90f6
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2018-11-14 09:28:19 +01:00
parent 2cac5c0f0c
commit 73b1a765f3
3 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,27 +595,24 @@ void CMakeProject::updateApplicationAndDeploymentTargets()
if (!t)
return;
QFile deploymentFile;
QTextStream deploymentStream;
QString deploymentPrefix;
QDir sourceDir(t->project()->projectDirectory().toString());
QDir buildDir(t->activeBuildConfiguration()->buildDirectory().toString());
deploymentFile.setFileName(sourceDir.filePath("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("QtCreatorDeployment.txt"));
if (deploymentFile.open(QFile::ReadOnly | QFile::Text)) {
deploymentStream.setDevice(&deploymentFile);
deploymentPrefix = deploymentStream.readLine();
if (!deploymentPrefix.endsWith('/'))
deploymentPrefix.append('/');
}
BuildTargetInfoList appTargetList;
DeploymentData deploymentData;
QString deploymentPrefix;
QString deploymentFilePath = sourceDir.filePath("QtCreatorDeployment.txt");
bool hasDeploymentFile = QFileInfo::exists(deploymentFilePath);
if (!hasDeploymentFile) {
deploymentFilePath = buildDir.filePath("QtCreatorDeployment.txt");
hasDeploymentFile = QFileInfo::exists(deploymentFilePath);
}
if (hasDeploymentFile) {
deploymentPrefix = deploymentData.addFilesFromDeploymentFile(deploymentFilePath,
sourceDir.absolutePath());
}
foreach (const CMakeBuildTarget &ct, buildTargets()) {
if (ct.targetType == UtilityType)
continue;
@@ -639,19 +636,6 @@ void CMakeProject::updateApplicationAndDeploymentTargets()
}
}
QString absoluteSourcePath = sourceDir.absolutePath();
if (!absoluteSourcePath.endsWith('/'))
absoluteSourcePath.append('/');
if (deploymentStream.device()) {
while (!deploymentStream.atEnd()) {
QString line = deploymentStream.readLine();
if (!line.contains(':'))
continue;
QStringList file = line.split(':');
deploymentData.addFile(absoluteSourcePath + file.at(0), deploymentPrefix + file.at(1));
}
}
t->setApplicationTargets(appTargetList);
t->setDeploymentData(deploymentData);
}