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

[fix] Fixed Windows build

Browse Source
This commit is contained in:
Leroy.H.Y 2019-12-09 22:16:29 +08:00
parent 1053c72b85
commit 4e142e3e01
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-release.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
run: git submodule update --init run: git submodule update --init
# -------------------------------------------------------- # --------------------------------------------------------
- name: Installing Qt - name: Installing Qt
uses: jurplel/install-qt-action@v2 uses: lhy0403/install-qt-action@v2
with: with:
arch: win64_mingw73 arch: win64_mingw73
modules: qtcharts modules: qtcharts
@ -68,7 +68,7 @@ jobs:
run: git submodule update --init run: git submodule update --init
# -------------------------------------------------------- # --------------------------------------------------------
- name: Installing Qt - name: Installing Qt
uses: jurplel/install-qt-action@v2 uses: lhy0403/install-qt-action@v2
with: with:
modules: qtcharts modules: qtcharts
# -------------------------------------------------------- # --------------------------------------------------------
@ -113,7 +113,7 @@ jobs:
run: git submodule update --init run: git submodule update --init
# -------------------------------------------------------- # --------------------------------------------------------
- name: Installing Qt - name: Installing Qt
uses: jurplel/install-qt-action@v2 uses: lhy0403/install-qt-action@v2
with: with:
modules: qtcharts modules: qtcharts
# -------------------------------------------------------- # --------------------------------------------------------

2
Build.Counter
View File

@ -1 +1 @@
1678 1687

4
Qv2ray.pro
View File

@ -189,8 +189,8 @@ win32 {
message(" --> Linking against gRPC and protobuf library.") message(" --> Linking against gRPC and protobuf library.")
LIBS += -L$$PWD/libs/gRPC-win32/lib/ -llibgrpc++.dll -llibprotobuf.dll LIBS += -L$$PWD/libs/gRPC-win32/lib/ -llibgrpc++.dll -llibprotobuf.dll
message(" --> Linking against winHTTP.") message(" --> Linking against winHTTP and winSock2.")
LIBS += -lwinhttp -lwininet LIBS += -lwinhttp -lwininet -lws2_32
INCLUDEPATH += $$PWD/libs/gRPC-win32/include INCLUDEPATH += $$PWD/libs/gRPC-win32/include
DEPENDPATH += $$PWD/libs/gRPC-win32/include DEPENDPATH += $$PWD/libs/gRPC-win32/include

4
src/components/QvTCPing.cpp
View File

@ -39,7 +39,11 @@ namespace Qv2ray
int errcode; int errcode;
if ((errcode = resolveHost(data.hostName.toStdString(), data.port, &resolved)) != 0) { if ((errcode = resolveHost(data.hostName.toStdString(), data.port, &resolved)) != 0) {
#if defined (__WIN32) && defined (UNICODE)
data.errorMessage = QString::fromStdWString(gai_strerror(errcode));
#else
data.errorMessage = QSTRING(gai_strerror(errcode)); data.errorMessage = QSTRING(gai_strerror(errcode));
#endif
return data; return data;
} }

2
src/components/QvTCPing.hpp
View File

@ -2,9 +2,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include <winsock.h>
#include <ws2def.h> #include <ws2def.h>
#include <windows.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#else #else
#include <sys/socket.h> #include <sys/socket.h>

2
src/main.cpp
View File

@ -329,9 +329,9 @@ int main(int argc, char *argv[])
LOG(MODULE_INIT " " MODULE_UI, "Setting Qv2ray UI themes: " + confObject.uiConfig.theme) LOG(MODULE_INIT " " MODULE_UI, "Setting Qv2ray UI themes: " + confObject.uiConfig.theme)
} }
#endif
// Show MainWindow // Show MainWindow
MainWindow w; MainWindow w;
#endif
#ifndef QT_DEBUG #ifndef QT_DEBUG
try { try {