diff options
| author |  bunnei | 2020-09-11 15:19:29 -0700 |
|---|---|---|
| committer |  GitHub | 2020-09-11 15:19:29 -0700 |
| commit | f4400f3ba28cbc62e0e59e3ba5615e1e13bc3a99 (patch) | |
| tree | 6b5d70ab838c0a5d1013ed0d48be825425e53462 | |
| parent | Merge pull request #4634 from lioncash/blocking (diff) | |
| parent | cmake: Update to Qt 5.12.8 (diff) | |
| download | yuzu-f4400f3ba28cbc62e0e59e3ba5615e1e13bc3a99.tar.gz yuzu-f4400f3ba28cbc62e0e59e3ba5615e1e13bc3a99.tar.xz yuzu-f4400f3ba28cbc62e0e59e3ba5615e1e13bc3a99.zip | |
Merge pull request #4638 from Morph1984/qt-5.12.8
cmake: Update to Qt 5.12.8
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f3c59c5d..45bd03a65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -210,7 +210,7 @@ if(ENABLE_QT) | |||
| 210 | set(QT_PREFIX_HINT) | 210 | set(QT_PREFIX_HINT) |
| 211 | if(YUZU_USE_BUNDLED_QT) | 211 | if(YUZU_USE_BUNDLED_QT) |
| 212 | if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) | 212 | if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64) |
| 213 | set(QT_VER qt-5.12.0-msvc2017_64) | 213 | set(QT_VER qt-5.12.8-msvc2017_64) |
| 214 | else() | 214 | else() |
| 215 | message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") | 215 | message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") |
| 216 | endif() | 216 | endif() |