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

QmakePM: Remove unused explicit shadow build flag

Browse Source 
Looks like the information has been based derived from
 buildDirectory() != target()->project()->projectDirectory()
for a while.

Change-Id: Ieb64e72d8fd1d4a6a339b695422fff6355cd3969
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-08-22 14:29:19 +02:00
parent e7040f1abf
commit b9d88d3966
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -101,7 +101,6 @@ static FilePath defaultBuildDirectory(const FilePath &projectPath,
suffix, type)); suffix, type));
} }
const char USE_SHADOW_BUILD_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild";
const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration"; const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration";
enum { debug = 0 }; enum { debug = 0 };
@@ -181,7 +180,6 @@ QmakeBuildConfiguration::~QmakeBuildConfiguration() = default;
QVariantMap QmakeBuildConfiguration::toMap() const QVariantMap QmakeBuildConfiguration::toMap() const
{ {
QVariantMap map(BuildConfiguration::toMap()); QVariantMap map(BuildConfiguration::toMap());
map.insert(QLatin1String(USE_SHADOW_BUILD_KEY), m_shadowBuild);
map.insert(QLatin1String(BUILD_CONFIGURATION_KEY), int(m_qmakeBuildConfiguration)); map.insert(QLatin1String(BUILD_CONFIGURATION_KEY), int(m_qmakeBuildConfiguration));
return map; return map;
} }
@@ -191,7 +189,6 @@ bool QmakeBuildConfiguration::fromMap(const QVariantMap &map)
if (!BuildConfiguration::fromMap(map)) if (!BuildConfiguration::fromMap(map))
return false; return false;
m_shadowBuild = map.value(QLatin1String(USE_SHADOW_BUILD_KEY), true).toBool();
m_qmakeBuildConfiguration = BaseQtVersion::QmakeBuildConfigs(map.value(QLatin1String(BUILD_CONFIGURATION_KEY)).toInt()); m_qmakeBuildConfiguration = BaseQtVersion::QmakeBuildConfigs(map.value(QLatin1String(BUILD_CONFIGURATION_KEY)).toInt());
m_lastKitState = LastKitState(target()->kit()); m_lastKitState = LastKitState(target()->kit());

2
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
View File

@@ -97,7 +97,6 @@ signals:
/// emitted for setQMakeBuildConfig, not emitted for Qt version changes, even /// emitted for setQMakeBuildConfig, not emitted for Qt version changes, even
/// if those change the qmakebuildconfig /// if those change the qmakebuildconfig
void qmakeBuildConfigurationChanged(); void qmakeBuildConfigurationChanged();
void shadowBuildChanged();
protected: protected:
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;
@@ -123,7 +122,6 @@ private:
}; };
LastKitState m_lastKitState; LastKitState m_lastKitState;
bool m_shadowBuild = true;
QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration; QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration;
QmakeProFileNode *m_subNodeBuild = nullptr; QmakeProFileNode *m_subNodeBuild = nullptr;
ProjectExplorer::FileNode *m_fileNodeBuild = nullptr; ProjectExplorer::FileNode *m_fileNodeBuild = nullptr;