diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2020-08-22 20:08:38 +0200 |
|---|---|---|
| committer | Admiral H. Curtiss <pikachu025@gmail.com> | 2020-08-22 20:08:38 +0200 |
| commit | f859da112eeff2ab8ea8661c3b6dbba9905ed453 (patch) | |
| tree | 8ecf09918a008c71b5aabf615d17fe6adc9efdfe /Source | |
| parent | 225592a106f438cd9c52e7a0da6920da6e2056c3 (diff) | |
Update Windows build to use Qt 5.15.0.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/VSProps/QtCompile.props | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 5d0ce64cbc..9216e9702b 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -1,8 +1,8 @@ if (NOT Qt5_DIR AND MSVC) if(_M_ARM_64) - set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.14.1/msvc2019_arm64/lib/cmake/Qt5") + set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.15.0/msvc2019_arm64/lib/cmake/Qt5") else() - set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.14.1/msvc2019_64/lib/cmake/Qt5") + set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.15.0/msvc2019_64/lib/cmake/Qt5") endif() endif() diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props index e137e5adf8..6ee1546228 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> - <QTDIRDefault Condition="'$(Platform)'=='x64'">$(ExternalsDir)Qt\Qt5.14.1\msvc2019_64\</QTDIRDefault> - <QTDIRDefault Condition="'$(Platform)'=='ARM64'">$(ExternalsDir)Qt\Qt5.14.1\msvc2019_arm64\</QTDIRDefault> + <QTDIRDefault Condition="'$(Platform)'=='x64'">$(ExternalsDir)Qt\Qt5.15.0\msvc2019_64\</QTDIRDefault> + <QTDIRDefault Condition="'$(Platform)'=='ARM64'">$(ExternalsDir)Qt\Qt5.15.0\msvc2019_arm64\</QTDIRDefault> <QTDIR Condition="Exists('$(QTDIRDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QTDIRDefault)</QTDIR> <QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR> <QtDirValid>false</QtDirValid> |