diff options
author | Rainer Keller <rainer.keller@theqtcompany.com> | 2014-11-13 15:35:17 +0100 |
---|---|---|
committer | Rainer Keller <rainer.keller@theqtcompany.com> | 2014-11-14 15:58:20 +0200 |
commit | 1f0de42b9d5a8ef665e6799019eed898b0396586 (patch) | |
tree | eed8c5c4b25502d31a3e5b987347622308d02c36 /src/b2qt-flashing-wizard/commit_page.cpp | |
parent | 16a7842ddbd88f87db0b1486d5c2f418860e3e98 (diff) |
b2qt-flashing-wizard: Replace progressbar by label
Change-Id: Ic3b0a88fa73e94540d6b387e0e6f0a5292ccfab2
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Diffstat (limited to 'src/b2qt-flashing-wizard/commit_page.cpp')
-rw-r--r-- | src/b2qt-flashing-wizard/commit_page.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/b2qt-flashing-wizard/commit_page.cpp b/src/b2qt-flashing-wizard/commit_page.cpp index f152262..e7a3c16 100644 --- a/src/b2qt-flashing-wizard/commit_page.cpp +++ b/src/b2qt-flashing-wizard/commit_page.cpp @@ -86,47 +86,36 @@ void CommitPage::initializePage() i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/" + G_board + "/deploy.sh"); i->setAdditionalArgs(QStringList() << G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); - i->setProgressFile(":data/iMX6-4.2-eAndroid.progress"); 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->setEnvironment("VERBOSE","1"); - i->setProgressFile(":data/iMX6-eLinux.progress"); 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->setProgressFile("/tmp/foo"); i->setEnvironment("VERBOSE","1"); - i->setProgressFile(":data/beaglebone-eLinux.progress"); 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->setEnvironment("VERBOSE","1"); - i->setProgressFile(":data/beaglebone-4.2-eAndroid.progress"); mActor = i; } 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"); - if (G_mode == "fastboot") { - i->setProgressFile(":data/nexus7v2-4.4-eAndroid-fastboot.progress"); + if (G_mode == "fastboot") i->setAdditionalArgs(QStringList() << "-fastboot"); - } else - i->setProgressFile(":data/nexus7v2-4.4-eAndroid-adb.progress"); 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"); - if (G_mode == "fastboot") { + if (G_mode == "fastboot") i->setAdditionalArgs(QStringList() << "-fastboot"); - i->setProgressFile(":data/nexus7-4.4-eAndroid-fastboot.progress"); - } else - i->setProgressFile(":data/nexus7-4.4-eAndroid-adb.progress"); mActor = i; } else if (G_platform == "generic-4.2" && G_os == "eAndroid" && G_board == "nexus7") { ScriptWriter *i = new ScriptWriter(this); @@ -139,21 +128,18 @@ void CommitPage::initializePage() i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/deploy.sh"); i->setAdditionalArgs(QStringList() << G_device << "--verbose"); i->setEnvironment("VERBOSE","1"); - i->setProgressFile(":data/raspberrypi-eLinux.progress"); 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->setEnvironment("VERBOSE","1"); - i->setProgressFile(":data/imx6qsabresd-eLinux.progress"); 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->setEnvironment("VERBOSE","1"); - i->setProgressFile(":data/apalis-imx6-eLinux.progress"); mActor = i; } else { mError->setText("Unsupported platform combination"); |