Merge pull request #148 from QtExcel/qt6beta

Qt6beta
QtExcel · Mar 13, 2021 · b7b3d96 · b7b3d96
2 parents b1b374a + e67147e
commit b7b3d96
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 27 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -33,18 +33,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        qt_ver: [5.12.6]
+        os: [ubuntu-20.04]
+        qt_ver: [5.12.10]
         qt_target: [android]
-        qt_arch: [android_x86,android_armv7]
+        qt_arch: [android_x86,android_armv7,android_arm64_v8a]
     steps:
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v2.10.0
         with:
           version: ${{ matrix.qt_ver }}
           target: ${{ matrix.qt_target }}
           arch: ${{ matrix.qt_arch }}
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 1
       - name: build android

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -33,16 +33,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest]
-        qt_ver: [5.12.6]
+        os: [macos-10.15]
+        qt_ver: [5.12.10,5.15.2]
         qt_target: [ios]
     steps:
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v2.10.0
         with:
           version: ${{ matrix.qt_ver }}
           target: ${{ matrix.qt_target }}
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 1
       - name: build ios

diff --git a/WebServer/WebServer.pro b/WebServer/WebServer.pro
@@ -3,10 +3,6 @@
 TARGET = WebServer
 TEMPLATE = app
 
-equals( QT_MAJOR_VERSION, 6 ) {
-    QT += core5compat
-}
-
 QT += core
 QT += network
 QT -= gui

diff --git a/WebServer/context.hpp b/WebServer/context.hpp
@@ -5,10 +5,6 @@
 #include <QVariant>
 #include <QHash>
 
-#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
-#include <QtCore5Compat>
-#endif
-
 #include "request.hpp"
 #include "response.hpp"
 

diff --git a/WebServer/main.cpp b/WebServer/main.cpp
@@ -7,10 +7,6 @@
 #include <QVector>
 #include <QList>
 
-#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
-#include <QtCore5Compat>
-#endif
-
 #include "recurse.hpp"
 
 #include "xlsxdocument.h"

diff --git a/WebServer/recurse.hpp b/WebServer/recurse.hpp
@@ -18,7 +18,8 @@
 #include <QVector>
 
 #if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
-#include <QtCore5Compat>
+ #include <QRegularExpression>
+ #include <QRegularExpressionMatch>
 #endif
 
 #include <functional>
@@ -439,10 +440,19 @@ namespace Recurse
     {
         QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
 
+#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
+        QRegularExpression debug_strings("(recurse|development)");
+
+        QRegularExpressionMatch rem = debug_strings.match(env.value("DEBUG"));
+        if ( rem.hasMatch() )
+            m_debug = true;
+#else
         QRegExp debug_strings("(recurse|development)");
 
         if (debug_strings.indexIn(env.value("DEBUG")) != -1)
             m_debug = true;
+#endif
+
     }
 
     inline Application::Application(int &argc, char **argv, QObject *parent)

diff --git a/WebServer/request.hpp b/WebServer/request.hpp
@@ -8,7 +8,7 @@
 #include <QUrlQuery>
 
 #if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
-#include <QtCore5Compat>
+ #include <QRegularExpression>
 #endif
 
 class Request

diff --git a/WebServer/response.hpp b/WebServer/response.hpp
@@ -5,10 +5,6 @@
 #include <QHash>
 #include <QJsonDocument>
 
-#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
-#include <QtCore5Compat>
-#endif
-
 #include <functional>
 
 class Response