Start Qt6 migration
This commit is contained in:
parent
9236be7fbd
commit
4b7a8c6d6e
3 changed files with 5 additions and 0 deletions
|
@ -1,4 +1,5 @@
|
||||||
QT += gui network widgets
|
QT += gui network widgets
|
||||||
|
equals(QT_MAJOR_VERSION, 6): QT += core5compat
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD
|
INCLUDEPATH += $$PWD
|
||||||
DEPENDPATH += $$PWD
|
DEPENDPATH += $$PWD
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
QT += widgets core gui network xml remoteobjects quick svg
|
QT += widgets core gui network xml remoteobjects quick svg
|
||||||
|
equals(QT_MAJOR_VERSION, 6): QT += core5compat
|
||||||
|
|
||||||
TARGET = AmneziaVPN
|
TARGET = AmneziaVPN
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
|
@ -15,6 +16,8 @@ include("3rd/QtSsh/src/ssh/qssh.pri")
|
||||||
include("3rd/QtSsh/src/botan/botan.pri")
|
include("3rd/QtSsh/src/botan/botan.pri")
|
||||||
!android:!ios:include("3rd/SingleApplication/singleapplication.pri")
|
!android:!ios:include("3rd/SingleApplication/singleapplication.pri")
|
||||||
include ("3rd/SortFilterProxyModel/SortFilterProxyModel.pri")
|
include ("3rd/SortFilterProxyModel/SortFilterProxyModel.pri")
|
||||||
|
|
||||||
|
win32-msvc*: DEFINES += __STDC_CONSTANT_MACROS
|
||||||
include("3rd/qzxing/src/QZXing-components.pri")
|
include("3rd/qzxing/src/QZXing-components.pri")
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/3rd/OpenSSL/include
|
INCLUDEPATH += $$PWD/3rd/OpenSSL/include
|
||||||
|
|
|
@ -2,6 +2,7 @@ TARGET = AmneziaVPN-service
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
CONFIG += console qt no_batch
|
CONFIG += console qt no_batch
|
||||||
QT += core network remoteobjects
|
QT += core network remoteobjects
|
||||||
|
equals(QT_MAJOR_VERSION, 6): QT += core5compat
|
||||||
|
|
||||||
HEADERS = \
|
HEADERS = \
|
||||||
../../client/utils.h \
|
../../client/utils.h \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue