diff options
author | Rainer Keller <rainer.keller@theqtcompany.com> | 2014-11-19 15:49:51 +0100 |
---|---|---|
committer | Rainer Keller <rainer.keller@theqtcompany.com> | 2014-11-19 16:49:47 +0200 |
commit | 83b9a1830fac611f77ee0f4f04dee82e06e1fb91 (patch) | |
tree | 75f666ca7072a2c590cb90824ed92b5bf717cb3f | |
parent | 28afa0104578d7e10bb7a5e1267284df980cce94 (diff) |
b2qt-flashing-wizard: Use dontask option instead of writing 'y'
Change-Id: Ic61caa0a334e4c3d54b945e3227c2b5e363f6f50
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
-rw-r--r-- | src/b2qt-flashing-wizard/commit_page.cpp | 14 | ||||
-rw-r--r-- | src/b2qt-flashing-wizard/scriptwriter.cpp | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/b2qt-flashing-wizard/commit_page.cpp b/src/b2qt-flashing-wizard/commit_page.cpp index 527c1db..2236139 100644 --- a/src/b2qt-flashing-wizard/commit_page.cpp +++ b/src/b2qt-flashing-wizard/commit_page.cpp @@ -84,25 +84,25 @@ void CommitPage::initializePage() if (G_platform == "generic-4.2" && G_os == "eAndroid" && G_board == "iMX6") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/" + G_board + "/deploy.sh"); - i->setAdditionalArgs(QStringList() << G_device << "--verbose"); + i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); mActor = i; } else if (G_platform == "iMX6" && G_os == "eLinux") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/deploy.sh"); - i->setAdditionalArgs(QStringList() << G_device << "--verbose"); + i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); mActor = i; } else if (G_platform == "beaglebone" && G_os == "eLinux") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/deploy.sh"); - i->setAdditionalArgs(QStringList() << G_device << "--verbose"); + i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); mActor = i; } else if (G_platform == "generic-4.4" && G_os == "eAndroid" && G_board == "beaglebone") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/" + G_board + "/deploy.sh"); - i->setAdditionalArgs(QStringList() << G_device << "--verbose"); + i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); mActor = i; } else if (G_platform == "generic-4.4" && G_os == "eAndroid" && G_board == "nexus7v2") { @@ -126,19 +126,19 @@ void CommitPage::initializePage() } else if (G_platform == "raspberrypi" && G_os == "eLinux") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/deploy.sh"); - i->setAdditionalArgs(QStringList() << G_device << "--verbose"); + i->setAdditionalArgs(QStringList() << "-y" << G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); mActor = i; } else if (G_platform == "imx6qsabresd" && G_os == "eLinux") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/deploy.sh"); - i->setAdditionalArgs(QStringList() << G_device << "--verbose"); + i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); mActor = i; } else if (G_platform == "apalis-imx6" && G_os == "eLinux") { ScriptWriter *i = new ScriptWriter(this); i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/deploy.sh"); - i->setAdditionalArgs(QStringList() << G_device << "--verbose"); + i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); mActor = i; } else { diff --git a/src/b2qt-flashing-wizard/scriptwriter.cpp b/src/b2qt-flashing-wizard/scriptwriter.cpp index 3c5f213..9b85c24 100644 --- a/src/b2qt-flashing-wizard/scriptwriter.cpp +++ b/src/b2qt-flashing-wizard/scriptwriter.cpp @@ -100,7 +100,6 @@ void ScriptWriter::start() mProcess.start(args.takeFirst(), args); if (!mProcess.waitForStarted()) qFatal("Failed to start script"); - mProcess.write("y\n"); } void ScriptWriter::readOutput() |