From 38b61edaa50bd8143360821aef0c2987db67fefa Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 23 Jun 2017 00:40:55 -0700
Subject: [PATCH] Qt/Windows: Properly link against qtmain.

---
 Externals/Qt                    | 2 +-
 Source/Core/DolphinQt2/Main.cpp | 2 ++
 Source/VSProps/QtCompile.props  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Externals/Qt b/Externals/Qt
index 63293e758f..864c13b666 160000
--- a/Externals/Qt
+++ b/Externals/Qt
@@ -1 +1 @@
-Subproject commit 63293e758fb82e675a3daa88a51407d3ccac1a9f
+Subproject commit 864c13b6664a7b44cf4142019fbf0f76a06de6de
diff --git a/Source/Core/DolphinQt2/Main.cpp b/Source/Core/DolphinQt2/Main.cpp
index 06fc993aaf..8d58eea54b 100644
--- a/Source/Core/DolphinQt2/Main.cpp
+++ b/Source/Core/DolphinQt2/Main.cpp
@@ -19,6 +19,8 @@
 #include "UICommon/CommandLineParse.h"
 #include "UICommon/UICommon.h"
 
+// N.B. On Windows, this should be called from WinMain. Link against qtmain and specify
+// /SubSystem:Windows
 int main(int argc, char* argv[])
 {
   QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props
index 25ccf977a9..50667968a7 100644
--- a/Source/VSProps/QtCompile.props
+++ b/Source/VSProps/QtCompile.props
@@ -36,6 +36,7 @@
     <Link>
       <AdditionalLibraryDirectories>$(QtLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>qtmain$(QtLibSuffix).lib;Qt5Core$(QtLibSuffix).lib;Qt5Gui$(QtLibSuffix).lib;Qt5Widgets$(QtLibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Windows</SubSystem>
       <!--
       <AdditionalOptions>"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions)</AdditionalOptions>
       -->