diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-23 14:25:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 14:25:23 -0700 |
| commit | 485589f42dbac68fe45ff684e59cdc5daf3edfe2 (patch) | |
| tree | 1942b2ab8c50224ea49b1bc4e49cfb2d812ad6d8 | |
| parent | 4e39a42e6bcbdb97820aabde88124436fb6b5979 (diff) | |
| parent | 38b61edaa50bd8143360821aef0c2987db67fefa (diff) | |
Merge pull request #5668 from shuffle2/qt-winmain
Qt/Windows: Properly link against qtmain.
| m--------- | Externals/Qt | 0 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/Main.cpp | 2 | ||||
| -rw-r--r-- | Source/VSProps/QtCompile.props | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Externals/Qt b/Externals/Qt -Subproject 63293e758fb82e675a3daa88a51407d3ccac1a9 +Subproject 864c13b6664a7b44cf4142019fbf0f76a06de6d 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> --> |