diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-04-12 14:49:59 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-04-23 15:52:05 +0000 |
| commit | 261d7752b00dfe7191ebd1436e9e96a5212e1bb3 (patch) | |
| tree | 08e5040fe25cd244221b0dd5f9b296ef0487a331 /src/plugins/qmlprojectmanager | |
| parent | 8827d83115b5b3c88446dd3ba50341ca3b738c0a (diff) | |
RemoteLinux: Retrieve deployment info from local install root
This provides correct deployment information as seen by the build system
when Qt Creator cannot retrieve it directly.
It's most useful for autotools and cmake projects, but can also help
with qmake in certain edge cases.
[ChangeLog] It is no longer necessary to provide a
QtCreatorDeployment.txt file when using CMake projects with remote Linux
devices.
Fixes: QTCREATORBUG-21855
Change-Id: I27e07a45dd1565e489f4b573cc3fff8191c57d9b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 82d5faf6536..eea6758274e 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -347,6 +347,11 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro return RestoreResult::Ok; } +ProjectExplorer::DeploymentKnowledge QmlProject::deploymentKnowledge() const +{ + return DeploymentKnowledge::Perfect; +} + void QmlProject::generateProjectTree() { if (!m_projectItem) diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index 8f7bf30c044..67cc9127f9b 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -83,6 +83,8 @@ protected: RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override; private: + ProjectExplorer::DeploymentKnowledge deploymentKnowledge() const override; + void generateProjectTree(); void updateDeploymentData(ProjectExplorer::Target *target); void refreshFiles(const QSet<QString> &added, const QSet<QString> &removed); |