Compare commits

..

No commits in common. "9783f343e13523c201c1b17cdebffa852a3416e3" and "4cc42b2a650ea2340879038f03f31eb1a1f31727" have entirely different histories.

3 changed files with 2 additions and 23 deletions

View File

@ -15,19 +15,11 @@ DEFINES += QT_DEPRECATED_WARNINGS
# In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
# 1.3.6 : Do not update device-controller/json files, but have the library
# (in a later step) do that.
# Fixed sending messages to ISMAS.
# Always execute contents of opkg_commands-file (even if there are no
# changes).
VERSION=1.3.6
INCLUDEPATH += plugins
CONFIG += c++17
CONFIG += c++17 console
# CONFIG -= app_bundle
DEFINES+=APP_VERSION=\\\"$$VERSION\\\"

View File

@ -866,13 +866,7 @@ QString IsmasClient::jsonParseFailed(int resultCode, QString reason, QString con
version.toStdString().c_str());
}
std::optional<QString> IsmasClient::finalResult(int resultCode,
QString reason,
QString const &version) {
Q_UNUSED(resultCode);
Q_UNUSED(reason);
Q_UNUSED(version);
std::optional<QString> IsmasClient::finalResult(int resultCode, QString reason, QString const &version) {
/*
m_progressInPercent = 100;
if (resultCode == RESULT_CODE::SUCCESS) {

View File

@ -738,13 +738,6 @@ QStringList Update::getDcSoftAndHardWareVersion() {
}
bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
// 04.10.2023: deactivated -> first testing of opkg_commands
//
// wird auch nie wieder gebraucht, da alles von der dc-lib erledigt wird.
// die dc-lib braucht dazu nur datei-namen.
return true;
bool serialOpened = false;
QString const &parentName = Utils::getParentName();