Set version to v1.4.0. Set compile-option -O (FORTIFY_SOURCE).
This commit is contained in:
parent
d90954c6eb
commit
1e1820724d
@ -81,9 +81,19 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# Fix the path-names of the json-files and the device-controller.
|
# Fix the path-names of the json-files and the device-controller.
|
||||||
# Set automatic download of json-file in ATBUpdateTool.ini file for
|
# Set automatic download of json-file in ATBUpdateTool.ini file for
|
||||||
# a fresh clone of the repository.
|
# a fresh clone of the repository.
|
||||||
# 1.3.23 Added a 'break' to prevent a possible endless loop when checking if
|
# 1.3.23: Added a 'break' to prevent a possible endless loop when checking if
|
||||||
# the device is alive.
|
# the device is alive.
|
||||||
VERSION="1.3.24"
|
#
|
||||||
|
# NOTE: The versioning info has to be shifted up by one version, i.e. what
|
||||||
|
# happened for 1.3.23 was actually done in 1.3.24.
|
||||||
|
# 1.3.24
|
||||||
|
#
|
||||||
|
# 1.3._24_: Special version for szeged using a old dc-controller (4.42):
|
||||||
|
# Changes:
|
||||||
|
# (1) the ini-File now uses the libCAmaster.so.
|
||||||
|
# 1.3._25_: Again special version for szeged, using interface.h, version 4.4.
|
||||||
|
# 1.4.0 : Start with version at 1.4.0 (mainly to see a difference with Szeged)
|
||||||
|
VERSION="1.4.0"
|
||||||
|
|
||||||
# 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.
|
||||||
@ -170,7 +180,7 @@ DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
|
|||||||
# keep comments, as /* fall through */
|
# keep comments, as /* fall through */
|
||||||
QMAKE_CXXFLAGS += -C
|
QMAKE_CXXFLAGS += -C
|
||||||
QMAKE_CXXFLAGS += -g
|
QMAKE_CXXFLAGS += -g
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
|
||||||
|
|
||||||
contains( CONFIG, PTU5 ) {
|
contains( CONFIG, PTU5 ) {
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
||||||
|
Loading…
Reference in New Issue
Block a user