diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-07-08 11:09:28 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-07-12 14:45:51 +0200 |
| commit | 223a1df854e77a996b5181eb5703d0eef2a750bb (patch) | |
| tree | a5f219e46295ffdcb90cff3c6f18f9a4df135597 /src/plugins/projectexplorer/projectexplorersettings.h | |
| parent | 43a7cbc1fe36153bc789d4892e855973462b5c2d (diff) | |
Wire in Deployment logic
Diffstat (limited to 'src/plugins/projectexplorer/projectexplorersettings.h')
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorersettings.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/projectexplorersettings.h b/src/plugins/projectexplorer/projectexplorersettings.h index 74b6f1c3637..256f4ef2639 100644 --- a/src/plugins/projectexplorer/projectexplorersettings.h +++ b/src/plugins/projectexplorer/projectexplorersettings.h @@ -37,11 +37,11 @@ namespace Internal { struct ProjectExplorerSettings { - ProjectExplorerSettings() : buildBeforeRun(true), saveBeforeBuild(false), - showCompilerOutput(false), - cleanOldAppOutput(false), useJom(true) {} + ProjectExplorerSettings() : buildBeforeDeploy(true), deployBeforeRun(true), saveBeforeBuild(false), + showCompilerOutput(false), cleanOldAppOutput(false), useJom(true) {} - bool buildBeforeRun; + bool buildBeforeDeploy; + bool deployBeforeRun; bool saveBeforeBuild; bool showCompilerOutput; bool cleanOldAppOutput; @@ -54,7 +54,8 @@ struct ProjectExplorerSettings inline bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerSettings &p2) { - return p1.buildBeforeRun == p2.buildBeforeRun + return p1.buildBeforeDeploy == p2.buildBeforeDeploy + && p1.deployBeforeRun == p2.deployBeforeRun && p1.saveBeforeBuild == p2.saveBeforeBuild && p1.showCompilerOutput == p2.showCompilerOutput && p1.cleanOldAppOutput == p2.cleanOldAppOutput |