update

Author: treefrogframework

.github/workflows/actions.yml

@@ -103,6 +103,8 @@ jobs:
         sudo apt install -y --no-install-recommends pkg-config qmake6 qt6-base-dev qt6-base-dev-tools qt6-tools-dev-tools qt6-declarative-dev libqt6sql6-mysql libqt6sql6-psql libqt6sql6-odbc libqt6sql6-sqlite libqt6core6 libqt6qml6 libqt6xml6 libpq5 libodbc2 libmongoc-dev libbson-dev liblz4-dev gcc g++ clang make cmake
     - name: qmake version
       run: |
+        sudo rm -f /usr/bin/qmake
+        sudo ln -sf /usr/bin/qmake6 /usr/bin/qmake
         qmake -v
     - name: configure
       run: ./configure --prefix=/usr/local --spec=linux-g++

defaults/CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.1)
 
 project(appname CXX)
 
-# C++14
-set(CMAKE_CXX_STANDARD 14)
+# C++20
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # cxx options
 if (MSVC)

defaults/appbase.pri

@@ -1,10 +1,5 @@
-lessThan(QT_MAJOR_VERSION, 6) {
-  CONFIG += c++14
-  windows:QMAKE_CXXFLAGS += /std:c++14
-} else {
-  CONFIG += c++17
-  windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
-}
+CONFIG += c++20
+windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++20
 
 windows {
   INCLUDEPATH += $$quote($$(TFDIR)\\include)

include/TreeFrogModel

@@ -18,9 +18,7 @@
 #include "thttprequest.h"
 #include "tsession.h"
 
-#if QT_VERSION >= 0x050000
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#endif

include/TreeFrogView

@@ -10,9 +10,7 @@
 #include "tviewhelper.h"
 #include "twebapplication.h"
 
-#if QT_VERSION >= 0x050000
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#endif

src/tabstractcontroller.cpp

@@ -48,13 +48,9 @@ void TAbstractController::exportVariants(const QVariantMap &map)
     if (_exportVars.isEmpty()) {
         _exportVars = map;
     } else {
-#if QT_VERSION >= 0x050f00  // 5.15.0
         auto tmp = _exportVars;
         _exportVars = map;
         _exportVars.insert(tmp);
-#else
-        _exportVars.unite(map);
-#endif
     }
 }