net-proxy/Throne: add 1.0.0, drop 4.3.7

Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
This commit is contained in:
Pavel Sobolev
2025-08-03 22:35:14 +03:00
parent 38e2f6f823
commit d69478c55f
5 changed files with 31 additions and 28 deletions

View File

@@ -5,7 +5,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,6 @@ message("[CMAKE_FIND_ROOT_PATH] ${CMAKE_FIND_ROOT_PATH}")
@@ -42,7 +42,6 @@ message("[CMAKE_FIND_ROOT_PATH] ${CMAKE_FIND_ROOT_PATH}")
include("cmake/print.cmake")
include("cmake/nkr.cmake")
@@ -13,7 +13,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
find_package(Threads)
@@ -57,6 +56,7 @@ include("cmake/myproto.cmake")
@@ -54,6 +53,7 @@ include("cmake/myproto.cmake")
list(APPEND NKR_EXTERNAL_TARGETS myproto)
set(BUILD_SHARED_LIBS OFF)
@@ -23,11 +23,11 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
# Sources
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -50,7 +50,7 @@
@@ -51,7 +51,7 @@
#endif
#include <QToolTip>
#include <random>
-#include <3rdparty/QHotkey/qhotkey.h>
+#include <QHotkey>
#include <include/api/gRPC.h>
#include <3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.hpp>
#include <include/global/HTTPRequestHelper.hpp>

View File

@@ -15,7 +15,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
: m_qr(quirc_new())
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,11 +83,6 @@ set(PROJECT_SOURCES
@@ -80,11 +80,6 @@ set(PROJECT_SOURCES
3rdparty/qv2ray/v2/ui/widgets/speedchart/SpeedWidget.hpp
3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp
@@ -24,14 +24,14 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
- 3rdparty/quirc/quirc.c
- 3rdparty/quirc/version_db.c
-
src/api/gRPC.cpp
src/dataStore/Database.cpp
@@ -263,6 +258,7 @@ target_link_libraries(nekoray PRIVATE
3rdparty/protorpc/rpc_client.cc
3rdparty/protorpc/rpc_conn.cc
3rdparty/protorpc/rpc_wire.cc
@@ -267,6 +262,7 @@ target_link_libraries(Throne PRIVATE
Threads::Threads
${NKR_EXTERNAL_TARGETS}
${PLATFORM_LIBRARIES}
+ quirc
)
qt_finalize_executable(nekoray)
qt_finalize_executable(Throne)

View File

@@ -2,10 +2,10 @@
Version=1.0
Terminal=false
Type=Application
Name=NekoRay
Name=Throne
Categories=Network;
Comment=Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
Comment[zh_CN]= Qt ( sing-box)
Keywords=Internet;VPN;Proxy;sing-box;
Exec=nekoray
Icon=nekobox
Exec=Throne
Icon=Throne