Compare commits
4 Commits
4cc42b2a65
...
9783f343e1
Author | SHA1 | Date | |
---|---|---|---|
9783f343e1 | |||
8c6f0dfcc7 | |||
d688ad3d5c | |||
7b3f652b0e |
@ -15,11 +15,19 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# In order to do so, uncomment the following line.
|
# 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.
|
# 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
|
#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
|
VERSION=1.3.6
|
||||||
|
|
||||||
INCLUDEPATH += plugins
|
INCLUDEPATH += plugins
|
||||||
|
|
||||||
CONFIG += c++17 console
|
|
||||||
|
CONFIG += c++17
|
||||||
# CONFIG -= app_bundle
|
# CONFIG -= app_bundle
|
||||||
|
|
||||||
DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
|
DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
|
||||||
|
@ -866,7 +866,13 @@ QString IsmasClient::jsonParseFailed(int resultCode, QString reason, QString con
|
|||||||
version.toStdString().c_str());
|
version.toStdString().c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::optional<QString> IsmasClient::finalResult(int resultCode, QString reason, QString const &version) {
|
std::optional<QString> IsmasClient::finalResult(int resultCode,
|
||||||
|
QString reason,
|
||||||
|
QString const &version) {
|
||||||
|
Q_UNUSED(resultCode);
|
||||||
|
Q_UNUSED(reason);
|
||||||
|
Q_UNUSED(version);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
m_progressInPercent = 100;
|
m_progressInPercent = 100;
|
||||||
if (resultCode == RESULT_CODE::SUCCESS) {
|
if (resultCode == RESULT_CODE::SUCCESS) {
|
||||||
|
@ -738,6 +738,13 @@ QStringList Update::getDcSoftAndHardWareVersion() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
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;
|
bool serialOpened = false;
|
||||||
|
|
||||||
QString const &parentName = Utils::getParentName();
|
QString const &parentName = Utils::getParentName();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user