From a4754eccdfc2585eb58c344a2c4cf3643ea935c7 Mon Sep 17 00:00:00 2001
From: Qv2ray-dev <59914293+Qv2ray-dev@users.noreply.github.com>
Date: Wed, 26 Feb 2020 17:30:49 +0800
Subject: [PATCH] Resolved conflict...

...In a not only quite straightforward but also extremely hacky method.
---
 makespec/03-Windows.pri | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/makespec/03-Windows.pri b/makespec/03-Windows.pri
index 524a2dba..b97605e8 100644
--- a/makespec/03-Windows.pri
+++ b/makespec/03-Windows.pri
@@ -3,6 +3,14 @@ message("Configuring for Windows environment")
 QMAKE_CXXFLAGS += /MP /wo4251
 DEFINES += QHTTPSERVER_EXPORT
 
+!has_std_byte {
+    message("WARN: c++17 std::byte is disabled")
+    DEFINES += _HAS_STD_BYTE=0
+} else {
+    message("WARN: You are playing with a conflict between c++17 std::byte and Windows.h typedef byte")
+    message("  --> Be careful and good luck")
+}
+
 CONFIG += Qv2ray_Windows use_grpc
 !contains(QMAKE_TARGET.arch, x86_64) {
     CONFIG+=Qv2ray_win32