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

CompilationDbProjectManager: Set deployment data, if available

Browse Source 
We use the same approach as for the generic project manager, namely the
QtCreatorDeployment.txt file.

Fixes: QTCREATORBUG-22965
Change-Id: Ia49dcd354b9ade8aeda259696aa29692cce1577b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Kandeler
2019-10-28 17:15:38 +01:00
parent 58c023e7c4
commit 46d3962d54
2 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
View File

@@ -38,13 +38,9 @@ QT_BEGIN_NAMESPACE
class QTimer;
QT_END_NAMESPACE
namespace CppTools {
class CppProjectUpdater;
}
namespace ProjectExplorer {
class Kit;
}
namespace CppTools { class CppProjectUpdater; }
namespace ProjectExplorer { class Kit; }
namespace Utils { class FileSystemWatcher; }
namespace CompilationDatabaseProjectManager {
namespace Internal {
@@ -63,6 +59,7 @@ private:
RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
void reparseProject();
void updateDeploymentData();
void buildTreeAndProjectParts();
Utils::FilePath rootPathFromSettings() const;
@@ -73,6 +70,7 @@ private:
QByteArray m_projectFileHash;
QTimer * const m_parseDelay;
CompilationDbParser *m_parser = nullptr;
Utils::FileSystemWatcher * const m_deployFileWatcher;
};
class CompilationDatabaseEditorFactory : public TextEditor::TextEditorFactory
@@ -88,10 +86,6 @@ class CompilationDatabaseBuildConfiguration : public ProjectExplorer::BuildConfi
Q_OBJECT
public:
CompilationDatabaseBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
ProjectExplorer::NamedWidget *createConfigWidget() override;
protected:
void initialize() override;
};
class CompilationDatabaseBuildConfigurationFactory