diff options
author | Rainer Keller <rainer.keller@theqtcompany.com> | 2014-11-24 13:48:30 +0100 |
---|---|---|
committer | Rainer Keller <rainer.keller@theqtcompany.com> | 2014-11-25 11:12:39 +0200 |
commit | 4aef9243de10efa87e80785522586a38b83dd02b (patch) | |
tree | adbde9738b8d29e985146d0ef45585b90f219dbb /src | |
parent | f250ce4f104cd0825f7cdfdeafdf763789d9d3eb (diff) |
b2qt-flashing-wizard: Use -y for android as well
Change-Id: I6d9999b8b4b5a3fb2c7d0782e0eb2ee86c971e8a
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/b2qt-flashing-wizard/commit_page.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/b2qt-flashing-wizard/commit_page.cpp b/src/b2qt-flashing-wizard/commit_page.cpp index 2236139..cb07247 100644 --- a/src/b2qt-flashing-wizard/commit_page.cpp +++ b/src/b2qt-flashing-wizard/commit_page.cpp @@ -108,20 +108,26 @@ void CommitPage::initializePage() } else if (G_platform == "generic-4.4" && G_os == "eAndroid" && G_board == "nexus7v2") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/" + G_board + "/deploy.sh"); + QStringList args("-y"); if (G_mode == "fastboot") - i->setAdditionalArgs(QStringList() << "-fastboot"); + args << "-fastboot"; + i->setAdditionalArgs(args); mActor = i; } else if (G_platform == "generic-4.4" && G_os == "eAndroid" && G_board == "nexus7") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/" + G_board + "/deploy.sh"); + QStringList args("-y"); if (G_mode == "fastboot") - i->setAdditionalArgs(QStringList() << "-fastboot"); + args << "-fastboot"; + i->setAdditionalArgs(args); mActor = i; } else if (G_platform == "generic-4.2" && G_os == "eAndroid" && G_board == "nexus7") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/" + G_board + "/deploy.sh"); + QStringList args("-y"); if (G_mode == "fastboot") - i->setAdditionalArgs(QStringList() << "-fastboot"); + args << "-fastboot"; + i->setAdditionalArgs(args); mActor = i; } else if (G_platform == "raspberrypi" && G_os == "eLinux") { ScriptWriter *i = new ScriptWriter(this); |