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

cancel c++17 adoption to avoid ambiguous method reference

Browse Source
This commit is contained in:
DuckSoft 2020-01-12 17:02:18 +08:00 committed by Leroy.H.Y
parent 048b8cb423
commit 31db9ab775
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Qv2ray.pro
View File

@ -23,7 +23,7 @@ no_increase_build_number {
DEFINES += QT_DEPRECATED_WARNINGS QV2RAY_VERSION_STRING=\"\\\"v$${VERSION}\\\"\" QAPPLICATION_CLASS=QApplication DEFINES += QT_DEPRECATED_WARNINGS QV2RAY_VERSION_STRING=\"\\\"v$${VERSION}\\\"\" QAPPLICATION_CLASS=QApplication
# Don't merge those configs with below. # Don't merge those configs with below.
CONFIG += enable_decoder_qr_code enable_encoder_qr_code qt c++17 openssl-linked CONFIG += enable_decoder_qr_code enable_encoder_qr_code qt c++11 openssl-linked
include(3rdparty/qzxing/src/QZXing-components.pri) include(3rdparty/qzxing/src/QZXing-components.pri)
include(3rdparty/SingleApplication/singleapplication.pri) include(3rdparty/SingleApplication/singleapplication.pri)

5
src/main.cpp
View File

@ -186,8 +186,9 @@ int main(int argc, char *argv[])
{ {
std::unique_ptr<QCoreApplication> consoleApp(new QCoreApplication(argc, argv)); std::unique_ptr<QCoreApplication> consoleApp(new QCoreApplication(argc, argv));
QvCommandArgParser parser; QvCommandArgParser parser;
QString errorMessage;
switch (QString errorMessage; parser.ParseCommandLine(&errorMessage)) {
switch (parser.ParseCommandLine(&errorMessage)) {
case CommandLineOk: case CommandLineOk:
break; break;