Merge branch 'master' of github.com:jankae/LibreVNA

This commit is contained in:
Jan Käberich 2024-03-01 09:08:43 +01:00
commit b7c2bf7cdd
14 changed files with 130 additions and 70 deletions

View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>497</width>
<height>297</height>
<width>488</width>
<height>364</height>
</rect>
</property>
<property name="windowTitle">

View file

@ -395,5 +395,5 @@ QMAKE_CXXFLAGS += -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-c
CONFIG += c++17
REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=5 FW_PATCH=0 FW_SUFFIX=""
DEFINES += FW_MAJOR=1 FW_MINOR=5 FW_PATCH=1 FW_SUFFIX=""
DEFINES -= _UNICODE UNICODE