ua1zbe
/
svxlink
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sm0svx/master' into tetra-contrib

This commit is contained in:
Adi Bier / DL1HRC 2021-02-02 08:54:48 +01:00
parent b45640148c 3759f8d3b6
commit 962b4a90fa
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -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()

5
src/qtel/EchoLinkDirectoryModel.cpp
View File

@ -133,11 +133,12 @@ EchoLinkDirectoryModel::~EchoLinkDirectoryModel(void)
void EchoLinkDirectoryModel::updateStationList(
const list<StationData> &stn_list)
{
#if QT_VERSION >= 0x050b00
#if QT_VERSION >= 0x050e00
QList<StationData> updated_stations(stn_list.begin(), stn_list.end());
std::stable_sort(updated_stations.begin(), updated_stations.end());
#else
QList<StationData> updated_stations = QList<StationData>::fromStdList(stn_list);
QList<StationData> updated_stations =
QList<StationData>::fromStdList(stn_list);
qStableSort(updated_stations);
#endif

2
src/versions
View File

@ -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