forked from qt-creator/qt-creator
QmakeProject: Remove DesktopQmakeRunConfiguration::toMap
Base functionality is sufficient nowadays, this was only kept for upgrading purposes. The data is never read back in post-4.7 Creator builds. Change-Id: I80c198ca2d17bc581d1576937a4d1ede3dc71fe0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -54,8 +54,6 @@ using namespace Utils;
|
|||||||
namespace QmakeProjectManager {
|
namespace QmakeProjectManager {
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
|
|
||||||
const char PRO_FILE_KEY[] = "Qt4ProjectManager.Qt4RunConfiguration.ProFile";
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// DesktopQmakeRunConfiguration
|
// DesktopQmakeRunConfiguration
|
||||||
//
|
//
|
||||||
@@ -107,15 +105,6 @@ void DesktopQmakeRunConfiguration::updateTargetInformation()
|
|||||||
aspect<ExecutableAspect>()->setExecutable(bti.targetFilePath);
|
aspect<ExecutableAspect>()->setExecutable(bti.targetFilePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariantMap DesktopQmakeRunConfiguration::toMap() const
|
|
||||||
{
|
|
||||||
// FIXME: For compatibility purposes in the 4.7 dev cycle only.
|
|
||||||
const QDir projectDir = QDir(target()->project()->projectDirectory().toString());
|
|
||||||
QVariantMap map(RunConfiguration::toMap());
|
|
||||||
map.insert(QLatin1String(PRO_FILE_KEY), projectDir.relativeFilePath(proFilePath().toString()));
|
|
||||||
return map;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool DesktopQmakeRunConfiguration::fromMap(const QVariantMap &map)
|
bool DesktopQmakeRunConfiguration::fromMap(const QVariantMap &map)
|
||||||
{
|
{
|
||||||
const bool res = RunConfiguration::fromMap(map);
|
const bool res = RunConfiguration::fromMap(map);
|
||||||
|
@@ -39,8 +39,6 @@ class DesktopQmakeRunConfiguration : public ProjectExplorer::RunConfiguration
|
|||||||
public:
|
public:
|
||||||
DesktopQmakeRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
|
DesktopQmakeRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
|
||||||
|
|
||||||
QVariantMap toMap() const override;
|
|
||||||
|
|
||||||
void addToBaseEnvironment(Utils::Environment &env) const;
|
void addToBaseEnvironment(Utils::Environment &env) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Reference in New Issue
Block a user