diff --git a/DownloadDCFirmware/DownloadDCFirmware.pro b/DownloadDCFirmware/DownloadDCFirmware.pro index 51f5641..2a1422e 100644 --- a/DownloadDCFirmware/DownloadDCFirmware.pro +++ b/DownloadDCFirmware/DownloadDCFirmware.pro @@ -98,9 +98,6 @@ OTHER_FILES += \ ../ATBUpdateTool.ini -FORMS += \ - mainwindow.ui - ########################################################################################## # for running program on target through QtCreator contains( CONFIG, PTU5 ) { diff --git a/UpdatePTUDevCtrl/git/git_client.cpp b/UpdatePTUDevCtrl/git/git_client.cpp index 0eac2aa..94b8d78 100644 --- a/UpdatePTUDevCtrl/git/git_client.cpp +++ b/UpdatePTUDevCtrl/git/git_client.cpp @@ -405,7 +405,7 @@ std::optional GitClient::gitPull() { export GIT_SSH_COMMAND="ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig -o StrictHostKeyChecking=no" ... or use separate known_hosts file: - export GIT_SSH_COMMAND="ssh -i /mypath/.keys/id_ed25519 -o StrictHostKeyChecking=yes -o UserKnownHostsFile=/opt/app/tools/atbupdate/.keys/known_hosts + export GIT_SSH_COMMAND="ssh -i /mypath/.keys/id_ed25519 -o StrictHostKeyChecking=yes -o UserKnownHostsFile=/opt/app/tools/atbupdate/.keys/known_hosts" git pull leads to the following warning/error message: diff --git a/UpdatePTUDevCtrl/utils.cpp b/UpdatePTUDevCtrl/utils.cpp index 7b7ec65..0d39252 100644 --- a/UpdatePTUDevCtrl/utils.cpp +++ b/UpdatePTUDevCtrl/utils.cpp @@ -178,6 +178,9 @@ QString Utils::zoneName(quint8 i) { //if (i < (sizeof(zName)/sizeof(char const *))) { // return zName[i]; //} + + Q_UNUSED(i) + return "---"; }