show Qt lib version, not Qt compile version; min CMake ver. 3.10 -> 3.12

Signed-off-by: Martin <[email protected]>

Author: Ho-Ro

CHANGELOG

@@ -1,4 +1,4 @@
-2025-09-02 (c73f7de): reorder logical functions
+2025-09-02 (68439b7): reorder logical functions; update translations
 2025-06-22 (e15ed3a): Added XOR function to the MathChannel module.
 2025-09-01 (ef3f244): Back to GO, disable MinGW build until a volunteer fixes it for Qt6
 2025-09-01 (8b3dd27): mingw-w64-x86_64-clang-libs: for lupdate

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 project(OpenHantek)
 
 find_package(Git)
@@ -76,19 +76,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 # enable extra feature(s)
-if( ${CMAKE_VERSION} VERSION_LESS "3.12.0" ) # deprecated, but still used in older Ubuntu releases
-    # Enable C++ standard library hardening -> cheap range checks for C++ arrays, vectors, and strings.
-    add_definitions( -D_GLIBCXX_ASSERTIONS )
-    add_definitions( -D_USE_MATH_DEFINES )
-    if ( DEFINED VERSION )
-        add_definitions( -DVERSION="${VERSION}" )
-    endif()
-else() # 'add_compile_definitions()' was introduced with CMake 3.12
-    add_compile_definitions( _GLIBCXX_ASSERTIONS )
-    add_compile_definitions( _USE_MATH_DEFINES )
-    if ( DEFINED VERSION )
-        add_compile_definitions( VERSION="${VERSION}" )
-    endif()
+# 'add_compile_definitions()' was introduced with CMake 3.12
+add_compile_definitions( _GLIBCXX_ASSERTIONS )
+add_compile_definitions( _USE_MATH_DEFINES )
+if ( DEFINED VERSION )
+    add_compile_definitions( VERSION="${VERSION}" )
 endif()
 
 # show all compile options and definitions

README.md

@@ -97,8 +97,8 @@ Every commit triggers a workflow on
 [GitHub Actions](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build_check.yml)
 that builds and packages OpenHantek6022 for:
 * Linux (`*.deb`, `*.rpm`, `*.tar.gz`)
-* Windows (`*_mingw_x64.zip`, `*_msvc_x64.zip`)
-* macOS - (`*.dmg`, `*.tar.gz`)
+* Windows (<!--`*_mingw_x64.zip`, -->`*_msvc_x64.zip`)
+* macOS - (`*_osx_arm64.dmg`, `*_osx_x86_64.dmg`, `*.tar.gz`)
 
 [![GitHub CI](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build.yml/badge.svg)](https://github.com/OpenHantek/OpenHantek6022/actions/workflows/build.yml)
 This status badge here (and on top) show the build status.
@@ -111,7 +111,7 @@ The easiest way to get an up-to-date working code base is to clone the code from
 ````git clone https://github.com/OpenHantek/OpenHantek6022.git````
 
 and then build it locally, for this you will need the following software:
-* [CMake 3.10+](https://cmake.org/download/)
+* [CMake 3.12+](https://cmake.org/download/)
 * [Qt 6.2+](https://www1.qt.io/download-open-source/)
 * [FFTW 3+](http://www.fftw.org/) (prebuild files will be downloaded on windows)
 * [libusb-1.0](https://libusb.info/), version >= 1.0.16 (prebuild files will be used on windows)

openhantek/src/mainwindow.cpp

@@ -526,7 +526,7 @@ MainWindow::MainWindow( HantekDsoControl *dsoControl, DsoSettings *settings, Exp
                 + tr( "<p>Graphic: %1 - GLSL version %2</p>"
                       "<p>Qt version: %3</p>" )
                       .arg( GlScope::getOpenGLversion(), GlScope::getGLSLversion(), // graphic info
-                            QT_VERSION_STR ) +                                      // Qt version info
+                            qVersion() ) +                                          // Qt lib version info
                 tr( "<p>Running since %1 seconds.</p>" ).arg( elapsedTime.elapsed() / 1000 ) );
     } );