From 15f3aa7ce624894ee4a4e3b2efa6f96a9014d41d Mon Sep 17 00:00:00 2001
From: Barath Kannan <barathsotd@gmail.com>
Date: Tue, 8 Nov 2016 22:16:13 +1100
Subject: plugin fixes

---
 ports/qt5/portfile.cmake | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake
index f65bee4ba..6b11a8abe 100644
--- a/ports/qt5/portfile.cmake
+++ b/ports/qt5/portfile.cmake
@@ -50,6 +50,7 @@ vcpkg_execute_required_process(
         -hostbindir ${CURRENT_PACKAGES_DIR}/tools
         -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5
         -datadir ${CURRENT_PACKAGES_DIR}/share/qt5
+        -plugindir ${CURRENT_PACKAGES_DIR}/plugins
     WORKING_DIRECTORY ${OUTPUT_PATH}
     LOGNAME configure-${TARGET_TRIPLET}
 )
@@ -115,9 +116,20 @@ file(REMOVE ${DEBUG_LIB_FILES})
 file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Gamepad.lib ${CURRENT_PACKAGES_DIR}/lib/Qt5Gamepad.lib)
 file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Gamepad.prl ${CURRENT_PACKAGES_DIR}/lib/Qt5Gamepad.prl)
 file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe")
-
 file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
 file(REMOVE ${BINARY_TOOLS})
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins")
+file(GLOB_RECURSE DEBUG_PLUGINS
+    "${CURRENT_PACKAGES_DIR}/plugins/*d.dll"
+    "${CURRENT_PACKAGES_DIR}/plugins/*d.pdb"
+)
+foreach(file ${DEBUG_PLUGINS})
+    get_filename_component(file_n ${file} NAME)
+    file(RELATIVE_PATH file_rel "${CURRENT_PACKAGES_DIR}/plugins" ${file})
+    get_filename_component(rel_dir ${file_rel} DIRECTORY)
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}")
+    file(RENAME ${file} "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}/${file_n}")
+endforeach()
 
 if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
     file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/bin/*.dll")
-- 
cgit v1.2.3


From bdcdb4408d9a42fde175ff755b913903b8c414b7 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Wed, 9 Nov 2016 15:21:52 -0800
Subject: [qt5] Version bump for plugin changes

---
 ports/qt5/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index 1629819e8..accc2ba07 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5
-Version: 5.7
+Version: 5.7-1
 Build-Depends:
 Description: Qt5 application framework main components. Webengine, examples and tests not included.
-- 
cgit v1.2.3