diff --git a/Externals/Qt b/Externals/Qt index 63293e758fb8..864c13b6664a 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 06fc993aafed..8d58eea54ba8 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 25ccf977a96e..50667968a7cb 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -36,6 +36,7 @@ $(QtLibDir);%(AdditionalLibraryDirectories) qtmain$(QtLibSuffix).lib;Qt5Core$(QtLibSuffix).lib;Qt5Gui$(QtLibSuffix).lib;Qt5Widgets$(QtLibSuffix).lib;%(AdditionalDependencies) + Windows