diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-12-31 19:19:23 +0100 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-12-31 19:19:23 +0100 |
commit | 15501477e75962f52d42cf5f4ada883319f33a7c (patch) | |
tree | 0a74e2eb1fcf98c552ce04ca55974ffb4fdd52ad | |
parent | travis: Use correct package for linux Qt5WebEngine (diff) | |
download | yuzu-15501477e75962f52d42cf5f4ada883319f33a7c.tar yuzu-15501477e75962f52d42cf5f4ada883319f33a7c.tar.gz yuzu-15501477e75962f52d42cf5f4ada883319f33a7c.tar.bz2 yuzu-15501477e75962f52d42cf5f4ada883319f33a7c.tar.lz yuzu-15501477e75962f52d42cf5f4ada883319f33a7c.tar.xz yuzu-15501477e75962f52d42cf5f4ada883319f33a7c.tar.zst yuzu-15501477e75962f52d42cf5f4ada883319f33a7c.zip |
Diffstat (limited to '')
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | 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$<$<CONFIG:Debug>:d>.* Qt5Gui$<$<CONFIG:Debug>:d>.* - Qt5Network$<$<CONFIG:Debug>:d>.* Qt5OpenGL$<$<CONFIG:Debug>:d>.* Qt5Widgets$<$<CONFIG:Debug>:d>.* ) if (YUZU_USE_QT_WEB_ENGINE) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} + Qt5Network$<$<CONFIG:Debug>:d>.* Qt5Positioning$<$<CONFIG:Debug>:d>.* Qt5PrintSupport$<$<CONFIG:Debug>:d>.* Qt5Qml$<$<CONFIG:Debug>:d>.* |