From 15501477e75962f52d42cf5f4ada883319f33a7c Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 31 Dec 2018 13:19:23 -0500 Subject: Update Qt MSVC external to 5.12.0 --- CMakeLists.txt | 2 +- CMakeModules/CopyYuzuQt5Deps.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8635d91f..871e0ca1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,7 +304,7 @@ endif() if (ENABLE_QT) if (YUZU_USE_BUNDLED_QT) if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) - set(QT_VER qt-5.10.0-msvc2015_64) + set(QT_VER qt-5.12.0-msvc2017_64) else() message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") endif() diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index a1ad8d8fb..db4cd88b6 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -16,13 +16,13 @@ function(copy_yuzu_Qt5_deps target_dir) icuuc*.dll Qt5Core$<$:d>.* Qt5Gui$<$:d>.* - Qt5Network$<$:d>.* Qt5OpenGL$<$:d>.* Qt5Widgets$<$:d>.* ) if (YUZU_USE_QT_WEB_ENGINE) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} + Qt5Network$<$:d>.* Qt5Positioning$<$:d>.* Qt5PrintSupport$<$:d>.* Qt5Qml$<$:d>.* -- cgit v1.2.3