From d59b28847c8f71ae0b6f9ce44579bcc64f49dfcb Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Thu, 8 Mar 2018 22:33:23 +0100
Subject: Added qdds.dll as Qt no longer contains it

---
 qdds.dll | Bin 0 -> 52224 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 qdds.dll

diff --git a/qdds.dll b/qdds.dll
new file mode 100644
index 00000000..3de8e38f
Binary files /dev/null and b/qdds.dll differ
-- 
cgit v1.3.1


From b7b12bb789d1a60ae0a7fc7fe923949c577cd8aa Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Sat, 10 Mar 2018 15:35:22 +0000
Subject: Separate windeployqt calls into their own EXECUTE_PROCESS calls so
 that they run sequentially

---
 src/CMakeLists.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed6c836a..c94aa689 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -347,13 +347,16 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5
 SET(windeploy_parameters "--no-translations --plugindir qtplugins --libdir dlls --release-with-debug-info --no-compiler-runtime")
 INSTALL(
     CODE
-    "EXECUTE_PROCESS(
-        COMMAND
+    "EXECUTE_PROCESS(COMMAND
         ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters}
-	# run it a second time because on the first run it misses some files
-	COMMAND
+        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
+    )
+    # run it a second time because on the first run it misses some files
+    EXECUTE_PROCESS(COMMAND
         ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters}
-        COMMAND
+        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
+    )
+    EXECUTE_PROCESS(COMMAND
         ${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters}
         WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
     )
-- 
cgit v1.3.1