From 4b7a8c6d6e6b7a75218e30c1862f26935418c321 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 10 Aug 2022 14:00:04 +0300
Subject: [PATCH] Start Qt6 migration

---
 client/3rd/QtSsh/src/ssh/qssh.pri | 1 +
 client/client.pro                 | 3 +++
 service/server/server.pro         | 1 +
 3 files changed, 5 insertions(+)

diff --git a/client/3rd/QtSsh/src/ssh/qssh.pri b/client/3rd/QtSsh/src/ssh/qssh.pri
index 657d0ff7..fbc20358 100644
--- a/client/3rd/QtSsh/src/ssh/qssh.pri
+++ b/client/3rd/QtSsh/src/ssh/qssh.pri
@@ -1,4 +1,5 @@
 QT += gui network widgets
+equals(QT_MAJOR_VERSION, 6): QT += core5compat
 
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
diff --git a/client/client.pro b/client/client.pro
index a39ec755..3c1468d5 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -1,4 +1,5 @@
 QT += widgets core gui network xml remoteobjects quick svg
+equals(QT_MAJOR_VERSION, 6): QT += core5compat
 
 TARGET = AmneziaVPN
 TEMPLATE = app
@@ -15,6 +16,8 @@ include("3rd/QtSsh/src/ssh/qssh.pri")
 include("3rd/QtSsh/src/botan/botan.pri")
 !android:!ios:include("3rd/SingleApplication/singleapplication.pri")
 include ("3rd/SortFilterProxyModel/SortFilterProxyModel.pri")
+
+win32-msvc*: DEFINES += __STDC_CONSTANT_MACROS
 include("3rd/qzxing/src/QZXing-components.pri")
 
 INCLUDEPATH += $$PWD/3rd/OpenSSL/include
diff --git a/service/server/server.pro b/service/server/server.pro
index 2c7097ec..e34eb8f4 100644
--- a/service/server/server.pro
+++ b/service/server/server.pro
@@ -2,6 +2,7 @@ TARGET   = AmneziaVPN-service
 TEMPLATE = app
 CONFIG   += console qt no_batch
 QT += core network remoteobjects
+equals(QT_MAJOR_VERSION, 6): QT += core5compat
 
 HEADERS = \
         ../../client/utils.h \