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

RemoteLinux: Classify executables correctly

Browse Source 
... in the MakeInstallStep.
See also d56e88d36a.

Fixes: QTCREATORBUG-25022
Change-Id: I0824355e0604cd4a7cc2ac9cdb4a55733cb0f706
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-12-02 15:25:57 +01:00
parent a02be5442e
commit b385bf8eb5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/remotelinux/makeinstallstep.cpp
View File

@@ -42,6 +42,7 @@
#include <QDirIterator> #include <QDirIterator>
#include <QFileInfo> #include <QFileInfo>
#include <QFormLayout> #include <QFormLayout>
#include <QSet>
#include <QTemporaryDir> #include <QTemporaryDir>
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -182,11 +183,16 @@ void MakeInstallStep::finish(bool success)
m_deploymentData.setLocalInstallRoot(installRoot()); m_deploymentData.setLocalInstallRoot(installRoot());
QDirIterator dit(installRoot().toString(), QDir::Files | QDir::Hidden, QDirIterator dit(installRoot().toString(), QDir::Files | QDir::Hidden,
QDirIterator::Subdirectories); QDirIterator::Subdirectories);
const auto appFileNames = transform<QSet<QString>>(buildSystem()->applicationTargets(),
[](const BuildTargetInfo &appTarget) { return appTarget.targetFilePath.fileName(); });
while (dit.hasNext()) { while (dit.hasNext()) {
dit.next(); dit.next();
const QFileInfo fi = dit.fileInfo(); const QFileInfo fi = dit.fileInfo();
const DeployableFile::Type type = appFileNames.contains(fi.fileName())
? DeployableFile::TypeExecutable
: DeployableFile::TypeNormal;
m_deploymentData.addFile(fi.filePath(), m_deploymentData.addFile(fi.filePath(),
fi.dir().path().mid(installRoot().toString().length())); fi.dir().path().mid(installRoot().toString().length()), type);
} }
buildSystem()->setDeploymentData(m_deploymentData); buildSystem()->setDeploymentData(m_deploymentData);
} else if (m_noInstallTarget && m_isCmakeProject) { } else if (m_noInstallTarget && m_isCmakeProject) {