github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 02:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Qt6 for QML build

Browse Source
This commit is contained in:
QxQ 2021-01-13 22:28:39 +08:00
parent 9047e7ac6f
commit 6cd5c9a100
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -108,6 +108,8 @@ option(QV2RAY_HAS_SINGLEAPPLICATION "Build With SingleApplication" ON)
set(QV2RAY_UI_TYPE "QWidget" CACHE STRING "Qv2ray GUI Component") set(QV2RAY_UI_TYPE "QWidget" CACHE STRING "Qv2ray GUI Component")
QVLOG(QV2RAY_UI_TYPE) QVLOG(QV2RAY_UI_TYPE)
option(QV2RAY_QT6 "Use Qt6" OFF)
if(QV2RAY_UI_TYPE STREQUAL "QWidget") if(QV2RAY_UI_TYPE STREQUAL "QWidget")
set(QV2RAY_USE_QWIDGET ON) set(QV2RAY_USE_QWIDGET ON)
set(QV2RAY_USE_QML OFF) set(QV2RAY_USE_QML OFF)
@ -126,7 +128,10 @@ if(ANDROID)
set(QV2RAY_USE_QML ON) set(QV2RAY_USE_QML ON)
set(QV2RAY_USE_QWIDGET OFF) set(QV2RAY_USE_QWIDGET OFF)
set(QV2RAY_HAS_SINGLEAPPLICATION OFF) set(QV2RAY_HAS_SINGLEAPPLICATION OFF)
set(QV2RAY_QT6 ON)
message("-- Use Qt6 for Android build.")
endif() endif()
QVLOG(QV2RAY_EMBED_TRANSLATIONS) QVLOG(QV2RAY_EMBED_TRANSLATIONS)
QVLOG(QV2RAY_USE_QML) QVLOG(QV2RAY_USE_QML)
QVLOG(QV2RAY_USE_QWIDGET) QVLOG(QV2RAY_USE_QWIDGET)
@ -138,6 +143,8 @@ if(QV2RAY_HAS_SINGLEAPPLICATION)
endif() endif()
if(QV2RAY_USE_QML) if(QV2RAY_USE_QML)
set(QV2RAY_QT6 ON)
message("-- Use Qt6 for QML build.")
option(QV2RAY_QML_LIVE_UPDATE "Use QMLLive for live updated QML" OFF) option(QV2RAY_QML_LIVE_UPDATE "Use QMLLive for live updated QML" OFF)
QVLOG(QV2RAY_QML_LIVE_UPDATE) QVLOG(QV2RAY_QML_LIVE_UPDATE)
elseif(QV2RAY_USE_QWIDGET) elseif(QV2RAY_USE_QWIDGET)
@ -147,14 +154,8 @@ elseif(QV2RAY_USE_QWIDGET)
QVLOG(QV2RAY_QNODEEDITOR_PROVIDER) QVLOG(QV2RAY_QNODEEDITOR_PROVIDER)
endif() endif()
option(QV2RAY_QT6 "Use Qt6" OFF)
if(ANDROID)
set(QV2RAY_QT6 ON)
message("-- Use Qt6 for Android build.")
endif()
QVLOG(QV2RAY_QT6) QVLOG(QV2RAY_QT6)
if(QV2RAY_QT6) if(QV2RAY_QT6)
cmake_policy(SET CMP0072 NEW) cmake_policy(SET CMP0072 NEW)
set(QV_QT_MAJOR_VERSION 6) set(QV_QT_MAJOR_VERSION 6)

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
6127 6128