From 796318d5dc385962a6c837bfb60b270719fab7be Mon Sep 17 00:00:00 2001 From: Tobias Blomberg Date: Mon, 1 Feb 2021 23:27:11 +0100 Subject: [PATCH 1/2] Correct Qt version for switching from deprecated functions The Qt version previously given (5.11) for switching from deprecated functions was wrong. It should be 5.14. --- src/qtel/EchoLinkDirectoryModel.cpp | 5 +++-- src/versions | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qtel/EchoLinkDirectoryModel.cpp b/src/qtel/EchoLinkDirectoryModel.cpp index eb620342..fb7f6413 100644 --- a/src/qtel/EchoLinkDirectoryModel.cpp +++ b/src/qtel/EchoLinkDirectoryModel.cpp @@ -133,11 +133,12 @@ EchoLinkDirectoryModel::~EchoLinkDirectoryModel(void) void EchoLinkDirectoryModel::updateStationList( const list &stn_list) { -#if QT_VERSION >= 0x050b00 +#if QT_VERSION >= 0x050e00 QList updated_stations(stn_list.begin(), stn_list.end()); std::stable_sort(updated_stations.begin(), updated_stations.end()); #else - QList updated_stations = QList::fromStdList(stn_list); + QList updated_stations = + QList::fromStdList(stn_list); qStableSort(updated_stations); #endif diff --git a/src/versions b/src/versions index 6e1ec457..63925473 100644 --- a/src/versions +++ b/src/versions @@ -2,7 +2,7 @@ PROJECT=master # Version for the Qtel application -QTEL=1.2.4.99.3 +QTEL=1.2.4.99.4 # Version for the EchoLib library LIBECHOLIB=1.3.3.99.0 From 3759f8d3b608a19e23bc91e625aa8da08410e2ca Mon Sep 17 00:00:00 2001 From: Tobias Blomberg Date: Mon, 1 Feb 2021 23:38:32 +0100 Subject: [PATCH 2/2] Require minimum CMake version 2.8.12 Compatibility with CMake versions < 2.8.12 will be dropped in a future version so CMake warns if the minimum required version is set to something lower than that. Previously SvxLink set the requirement to 2.8. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86fef109..ff14c3f0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,7 +20,7 @@ ############################################################################## # Project setup ############################################################################## -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12) project(svxlink C CXX) #enable_testing()