From 4aef9243de10efa87e80785522586a38b83dd02b Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Mon, 24 Nov 2014 13:48:30 +0100 Subject: b2qt-flashing-wizard: Use -y for android as well Change-Id: I6d9999b8b4b5a3fb2c7d0782e0eb2ee86c971e8a Reviewed-by: Samuli Piippo --- src/b2qt-flashing-wizard/commit_page.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') 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); -- cgit v1.2.3