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

oops

Browse Source
This commit is contained in:
Qv2ray-dev 2020-04-29 13:52:35 +08:00
parent bed087c22b
commit 65cc35cc87
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -33,7 +33,7 @@ if(MSVC)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
find_package(Qt5 5.11 COMPONENTS Core Gui Widgets Network Quick REQUIRED)
find_package(Qt5 5.11 COMPONENTS Core Gui Widgets Network Qml Quick REQUIRED)
find_package(Threads REQUIRED)
set(CMAKE_AUTOMOC ON)

4
CMakeLists.txt.orig
View File

@ -33,8 +33,12 @@ if(MSVC)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
<<<<<<< HEAD
find_package(Qt5 5.11 COMPONENTS Core Gui Widgets Network Quick REQUIRED)
find_package(Threads REQUIRED)
=======
find_package(Qt5 5.11 COMPONENTS Core Gui Widgets Network Qml Quick REQUIRED)
>>>>>>> 90a54f7... oops
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)