diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 0e4c7630b7..b889d3a4f9 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -472,11 +472,11 @@ if(MSVC) # them from the local QT installation at the end of the build. if(CMAKE_BUILD_TYPE STREQUAL "Debug") add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --debug ${CMAKE_BINARY_DIR}/bin + COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir ${CMAKE_BINARY_DIR}/bin/qt/plugins --debug ${CMAKE_BINARY_DIR}/bin ) else() add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick ${CMAKE_BINARY_DIR}/bin + COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir ${CMAKE_BINARY_DIR}/bin/qt/plugins ${CMAKE_BINARY_DIR}/bin ) endif() endif() diff --git a/rpcs3/qt/etc/qt.conf b/rpcs3/qt/etc/qt.conf new file mode 100644 index 0000000000..220ce33fa2 --- /dev/null +++ b/rpcs3/qt/etc/qt.conf @@ -0,0 +1,3 @@ +[Paths] +Prefix = qt/ +Plugins = plugins diff --git a/rpcs3/resources.qrc b/rpcs3/resources.qrc index bfc06c2dd9..889db0c063 100644 --- a/rpcs3/resources.qrc +++ b/rpcs3/resources.qrc @@ -27,5 +27,6 @@ Icons/stop_blue.png Icons/cog_black.png Icons/cog_gray.png + qt/etc/qt.conf diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index d1a5134abd..c53749a3ad 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -166,7 +166,7 @@ - $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick $(TargetPath) + $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir $(TargetDir)\qt\plugins $(TargetPath) @@ -218,7 +218,7 @@ - $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick $(TargetPath) + $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir $(TargetDir)\qt\plugins $(TargetPath) @@ -271,7 +271,7 @@ - $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --debug $(TargetPath) + $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir $(TargetDir)\qt\plugins --debug $(TargetPath) @@ -324,7 +324,7 @@ - $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --debug $(TargetPath) + $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --no-quick --plugindir $(TargetDir)\qt\plugins --debug $(TargetPath)