diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bae5e5d..dae6a827 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,6 +108,8 @@ option(QV2RAY_HAS_SINGLEAPPLICATION "Build With SingleApplication" ON) set(QV2RAY_UI_TYPE "QWidget" CACHE STRING "Qv2ray GUI Component") QVLOG(QV2RAY_UI_TYPE) +option(QV2RAY_QT6 "Use Qt6" OFF) + if(QV2RAY_UI_TYPE STREQUAL "QWidget") set(QV2RAY_USE_QWIDGET ON) set(QV2RAY_USE_QML OFF) @@ -126,7 +128,10 @@ if(ANDROID) set(QV2RAY_USE_QML ON) set(QV2RAY_USE_QWIDGET OFF) set(QV2RAY_HAS_SINGLEAPPLICATION OFF) + set(QV2RAY_QT6 ON) + message("-- Use Qt6 for Android build.") endif() + QVLOG(QV2RAY_EMBED_TRANSLATIONS) QVLOG(QV2RAY_USE_QML) QVLOG(QV2RAY_USE_QWIDGET) @@ -138,6 +143,8 @@ if(QV2RAY_HAS_SINGLEAPPLICATION) endif() 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) QVLOG(QV2RAY_QML_LIVE_UPDATE) elseif(QV2RAY_USE_QWIDGET) @@ -147,14 +154,8 @@ elseif(QV2RAY_USE_QWIDGET) QVLOG(QV2RAY_QNODEEDITOR_PROVIDER) endif() -option(QV2RAY_QT6 "Use Qt6" OFF) - -if(ANDROID) - set(QV2RAY_QT6 ON) - message("-- Use Qt6 for Android build.") -endif() - QVLOG(QV2RAY_QT6) + if(QV2RAY_QT6) cmake_policy(SET CMP0072 NEW) set(QV_QT_MAJOR_VERSION 6) diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index 86b28a46..7903e3a6 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -6127 +6128