From 9dbbbb631bf8944311c380eb7d0cf48fb431187b Mon Sep 17 00:00:00 2001 From: "Leroy.H.Y" Date: Sun, 18 Aug 2019 15:29:33 +0800 Subject: [PATCH 1/4] [docs] Fixed a broken git clone script (Fixed: #24) Signed-off-by: Leroy.H.Y Former-commit-id: 64718a8cd8015f1dae47affd20399457e5dbcf18 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 75468854..98cf9ddf 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Travis per machine badge provided by: [badge-matrix](https://github.com/exogen/b - 对于 Linux,请根据不同发行版安装对应的 Qt 开发包 ```bash -git clone https://github.com/lhy0403/Qv2ray && cd Qv2ray +git clone --recursive https://github.com/lhy0403/Qv2ray && cd Qv2ray # 按需要签出开发分支 # git checkout dev @@ -55,7 +55,7 @@ REM SET PATH=%PATH%;D:\Qt\5.12.3\mingw73_32\bin\;D:\Qt\Tools\mingw730_32\bin\ SET PATH=%PATH%;Qt安装目录\Qt版本号\编译器类型\bin;Qt安装目录\Tools\编译器类型\bin -git clone https://github.com/lhy0403/Qv2ray && cd Qv2ray +git clone --recursive https://github.com/lhy0403/Qv2ray && cd Qv2ray REM 按需要签出开发分支 REM git checkout dev From 3abde6d915481dd37a3b6064c86b2c06f4405b54 Mon Sep 17 00:00:00 2001 From: Hork Date: Wed, 28 Aug 2019 20:42:14 +0800 Subject: [PATCH 2/4] Add Qv2ray Former-commit-id: e60a1af9701e7e2fa0f5367a6cdc7416c3d4fc88 --- icons/Qv2ray.png | Bin 0 -> 17595 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/Qv2ray.png diff --git a/icons/Qv2ray.png b/icons/Qv2ray.png new file mode 100644 index 0000000000000000000000000000000000000000..d1c3e07d48c0f0a632f8ade27a7a942fd5a1742b GIT binary patch literal 17595 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 Date: Wed, 28 Aug 2019 20:43:43 +0800 Subject: [PATCH 3/4] Update Qv2ray.desktop Former-commit-id: b79ef2b5baaab9083a1d9153d1df19a5c531a91b --- icons/Qv2ray.desktop | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/icons/Qv2ray.desktop b/icons/Qv2ray.desktop index 8d1c8b69..37081326 100644 --- a/icons/Qv2ray.desktop +++ b/icons/Qv2ray.desktop @@ -1 +1,8 @@ - +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Categories=Network;Qt; +Icon=Qv2ray +Exec=/opt/Qv2ray/Qv2ray %u +Name=Qv2ray +Comment=Qt cross platform v2ray GUI client From ca434dd3fe12dcc38d1e33b8d1d47260b70e4d87 Mon Sep 17 00:00:00 2001 From: Hork Date: Thu, 29 Aug 2019 11:21:11 +0800 Subject: [PATCH 4/4] jenkins (#29) Merged documents. * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md Former-commit-id: be122031fc1631f5a952aa34f2197447528b934f --- README.md | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 98cf9ddf..3b4a324e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Qv2ray [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a034dd186c36408c92ffb04449fb6996)](https://app.codacy.com/app/lhy0403/Qv2ray?utm_source=github.com&utm_medium=referral&utm_content=lhy0403/Qv2ray&utm_campaign=Badge_Grade_Dashboard) [![HitCount](http://hits.dwyl.io/lhy0403/Qv2ray.svg)](http://hits.dwyl.io/lhy0403/Qv2ray) -使用 Qt 的跨平台 v2ray 客户端. +使用 Qt 框架的跨平台 v2ray 客户端. 支持 Windows, Linux, MacOS -## 项目主页地址和使用方法 -- https://lhy0403.github.io/Qv2ray +# 项目主页,下载链接和使用方法 + - 见 Github Page: https://lhy0403.github.io/Qv2ray ------------------------- @@ -17,17 +17,20 @@ Travis per machine badge provided by: [badge-matrix](https://github.com/exogen/b ---------------- -## 编译 - - - Qt >= 5.12 - - gcc >=8 (Linux 需要 c++11 支持) 或 MinGW (Windows) 或 clang (MacOS) - - QtCreator (推荐) - - -- 如果想测试当前的开发分支,请使用 `git checkout dev` 切换到开发分支 +# 开发分支测试 + - 如果想测试当前的开发分支,请使用 `git checkout dev` 切换到开发分支 - !! 该分支可能不稳定 或 甚至无法正常工作 !! -### Linux & MacOS +## Jenkins (Linux) +[jenkins.himeki.net](https://jenkins.himeki.net/job/Qv2ray/) 编译服务器提供开发分支 `dev` 的二进制编译版本 + - 开发分支仅供测试使用 + - 提供者 [@aliyuchang33](https://github.com/aliyuchang33) + +# 编译 + - 依赖项:`Qt >= 5.12` `gcc >=8` 或 `MinGW` (Windows) 或 `clang` (MacOS) + - 建议使用 QtCreator + +## Linux & MacOS - 对于 MacOS,需要额外使用 HomeBrew 安装 Qt 并正确设定 $PATH 环境变量,或者使用 Qt 官方包 (包含 QtCreator) - 对于 Linux,请根据不同发行版安装对应的 Qt 开发包 @@ -44,28 +47,24 @@ qmake ../ make ``` -### Windows +## Windows - 建议使用 Qt Creator ```batch -REM 首先把 %QTROOT%/bin 和 你的 MinGW/bin 文件夹添加到 PATH 里面 -REM 示例配置: +REM 首先把 %QTROOT%/bin 和 MinGW/bin 文件夹添加到 PATH 环境变量 REM SET PATH=%PATH%;D:\Qt\5.12.3\mingw73_32\bin\;D:\Qt\Tools\mingw730_32\bin\ SET PATH=%PATH%;Qt安装目录\Qt版本号\编译器类型\bin;Qt安装目录\Tools\编译器类型\bin git clone --recursive https://github.com/lhy0403/Qv2ray && cd Qv2ray -REM 按需要签出开发分支 -REM git checkout dev +REM git checkout dev (可选项,用于测试 dev 分支) -lrelease ./Qv2ray.pro mkdir build && cd build qmake ../ mingw32-make.exe ``` - # License [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)