update actions.

Author: treefrogframework

.github/workflows/actions.yml

@@ -15,11 +15,6 @@ jobs:
       run: |
         sudo apt update -qq
         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 liburing-dev gcc g++ clang make cmake yarnpkg
-    - name: qmake version
-      run: |
-        sudo rm -f /usr/bin/qmake
-        sudo ln -sf /usr/bin/qmake6 /usr/bin/qmake
-        qmake -v
     - name: configure for debug
       run: |
         ./configure --prefix=/usr/local --spec=linux-g++ --enable-debug
@@ -70,11 +65,6 @@ jobs:
       run: |
         sudo apt update -qq
         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 liburing-dev gcc g++ clang make cmake yarnpkg
-    - name: qmake version
-      run: |
-        sudo rm -f /usr/bin/qmake
-        sudo ln -sf /usr/bin/qmake6 /usr/bin/qmake
-        qmake -v
     - name: configure for debug
       run: |
         ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-lz4 --spec=linux-clang --enable-debug
@@ -125,11 +115,6 @@ jobs:
       run: |
         sudo apt update -qq
         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 liburing-dev gcc g++ clang make cmake yarn
-    - name: qmake version
-      run: |
-        sudo rm -f /usr/bin/qmake
-        sudo ln -sf /usr/bin/qmake6 /usr/bin/qmake
-        qmake -v
     - name: configure for debug
       run: |
         ./configure --prefix=/usr/local --spec=linux-g++ --enable-debug

configure

@@ -161,9 +161,8 @@ fi
 
 # search qmake command
 if [ -z "$QMAKE" ]; then
-  which qmake-qt5 >/dev/null 2>&1 && QMAKE=qmake-qt5
-  which qmake     >/dev/null 2>&1 && QMAKE=qmake
-  which qmake6    >/dev/null 2>&1 && QMAKE=qmake6
+  which qmake6 >/dev/null 2>&1 && QMAKE=qmake6
+  which qmake  >/dev/null 2>&1 && QMAKE=qmake
 
   if [ -z "$QMAKE" ]; then
     echo "qmake: command not found"

src/tglobal.h

@@ -1,7 +1,7 @@
 #pragma once
 constexpr auto TF_VERSION_STR = "2.12.0";
 constexpr auto TF_VERSION_NUMBER = 0x020c00;
-constexpr auto TF_SRC_REVISION = 3133;
+constexpr auto TF_SRC_REVISION = 3141;
 
 #include <QMetaType>
 #include <QIODevice>