File tree Expand file tree Collapse file tree 6 files changed +12
-18
lines changed Expand file tree Collapse file tree 6 files changed +12
-18
lines changed Original file line number Diff line number Diff line change 3
3
TARGET = WebServer
4
4
TEMPLATE = app
5
5
6
- equals( QT_MAJOR_VERSION, 6 ) {
7
- QT += core5compat
8
- }
9
-
10
6
QT += core
11
7
QT += network
12
8
QT -= gui
Original file line number Diff line number Diff line change 5
5
#include < QVariant>
6
6
#include < QHash>
7
7
8
- #if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
9
- #include < QtCore5Compat>
10
- #endif
11
-
12
8
#include " request.hpp"
13
9
#include " response.hpp"
14
10
Original file line number Diff line number Diff line change 7
7
#include < QVector>
8
8
#include < QList>
9
9
10
- #if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
11
- #include < QtCore5Compat>
12
- #endif
13
-
14
10
#include " recurse.hpp"
15
11
16
12
#include " xlsxdocument.h"
Original file line number Diff line number Diff line change 18
18
#include < QVector>
19
19
20
20
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
21
- #include < QtCore5Compat>
21
+ #include < QRegularExpression>
22
+ #include < QRegularExpressionMatch>
22
23
#endif
23
24
24
25
#include < functional>
@@ -439,10 +440,19 @@ namespace Recurse
439
440
{
440
441
QProcessEnvironment env = QProcessEnvironment::systemEnvironment ();
441
442
443
+ #if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
444
+ QRegularExpression debug_strings (" (recurse|development)" );
445
+
446
+ QRegularExpressionMatch rem = debug_strings.match (env.value (" DEBUG" ));
447
+ if ( rem.hasMatch () )
448
+ m_debug = true ;
449
+ #else
442
450
QRegExp debug_strings (" (recurse|development)" );
443
451
444
452
if (debug_strings.indexIn (env.value (" DEBUG" )) != -1 )
445
453
m_debug = true ;
454
+ #endif
455
+
446
456
}
447
457
448
458
inline Application::Application (int &argc, char **argv, QObject *parent)
Original file line number Diff line number Diff line change 8
8
#include < QUrlQuery>
9
9
10
10
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
11
- #include < QtCore5Compat >
11
+ #include < QRegularExpression >
12
12
#endif
13
13
14
14
class Request
Original file line number Diff line number Diff line change 5
5
#include < QHash>
6
6
#include < QJsonDocument>
7
7
8
- #if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
9
- #include < QtCore5Compat>
10
- #endif
11
-
12
8
#include < functional>
13
9
14
10
class Response
You can’t perform that action at this time.
0 commit comments