Compare commits
4 Commits
281/Szeged
...
1.5.99
| Author | SHA1 | Date | |
|---|---|---|---|
|
843ac23770
|
|||
|
c3b2db7797
|
|||
|
51640b70e9
|
|||
|
be84c96953
|
@@ -152,7 +152,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# 1.5.7 : Add support for dynamic portrait / landscape.
|
# 1.5.7 : Add support for dynamic portrait / landscape.
|
||||||
# 1.5.8 : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
|
# 1.5.8 : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
|
||||||
# 1.5.9 : Removed restart of Apism if ISMAS unreachable.
|
# 1.5.9 : Removed restart of Apism if ISMAS unreachable.
|
||||||
VERSION="1.5.9"
|
# 1.5.99 : Special version for 281/Szeged: remove all DC-library dependencies, as
|
||||||
|
# DC-firmware in Szeged does not support uploading json-files or uploading
|
||||||
|
# DC-firmware binaries.
|
||||||
|
VERSION="1.5.99"
|
||||||
# PLANNED TODOS:
|
# PLANNED TODOS:
|
||||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
@@ -258,9 +261,6 @@ contains( CONFIG, PTU5_YOCTO ) {
|
|||||||
PTU5BASEPATH = /opt/devel/ptu5
|
PTU5BASEPATH = /opt/devel/ptu5
|
||||||
ARCH = PTU5
|
ARCH = PTU5
|
||||||
DEFINES+=PTU5
|
DEFINES+=PTU5
|
||||||
|
|
||||||
LIBS += -lCAslave
|
|
||||||
LIBS += -lCAmaster
|
|
||||||
}
|
}
|
||||||
contains( CONFIG, DesktopLinux ) {
|
contains( CONFIG, DesktopLinux ) {
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
||||||
|
|||||||
@@ -290,7 +290,7 @@ void Worker::privateUpdate() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
//return;
|
||||||
|
|
||||||
QString func(__PRETTY_FUNCTION__);
|
QString func(__PRETTY_FUNCTION__);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user