From f8d717bc7aff7644b26cd3fb13818a64736297cd Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sat, 28 Mar 2020 09:20:48 -0600 Subject: [PATCH] Use the correct directory for Qt Plugins (#5148) --- CMakeModules/CopyCitraQt5Deps.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeModules/CopyCitraQt5Deps.cmake b/CMakeModules/CopyCitraQt5Deps.cmake index 88f9b8af1..d9014354e 100644 --- a/CMakeModules/CopyCitraQt5Deps.cmake +++ b/CMakeModules/CopyCitraQt5Deps.cmake @@ -6,10 +6,10 @@ function(copy_citra_Qt5_deps target_dir) set(Qt5_MEDIASERVICE_DIR "${Qt5_DIR}/../../../plugins/mediaservice/") set(Qt5_STYLES_DIR "${Qt5_DIR}/../../../plugins/styles/") set(Qt5_IMAGEFORMATS_DIR "${Qt5_DIR}/../../../plugins/imageformats/") - set(PLATFORMS ${DLL_DEST}platforms/) - set(MEDIASERVICE ${DLL_DEST}mediaservice/) - set(STYLES ${DLL_DEST}styles/) - set(IMAGEFORMATS ${DLL_DEST}imageformats/) + set(PLATFORMS ${DLL_DEST}plugins/platforms/) + set(MEDIASERVICE ${DLL_DEST}plugins/mediaservice/) + set(STYLES ${DLL_DEST}plugins/styles/) + set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} icudt*.dll icuin*.dll @@ -38,4 +38,10 @@ function(copy_citra_Qt5_deps target_dir) qwbmp$<$:d>.dll qwebp$<$:d>.dll ) + + # Create an empty qt.conf file. Qt will detect that this file exists, and use the folder that its in as the root folder. + # This way it'll look for plugins in the root/plugins/ folder + add_custom_command(TARGET citra-qt POST_BUILD + COMMAND ${CMAKE_COMMAND} -E touch ${DLL_DEST}qt.conf + ) endfunction(copy_citra_Qt5_deps)