From add836a053e7f083afd29065cd063728d9fcd01b Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Thu, 14 Nov 2019 22:52:20 +0000
Subject: [PATCH] Add qt platform plugin

---
 .circleci/config.yml           | 10 +++++++++-
 dist/windows/clementine.nsi.in |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad0a31a51..e144c2edf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -588,13 +588,21 @@ jobs:
             $CIRCLE_WORKING_DIRECTORY/dist/windows
       - run: mkdir dist/windows/imageformats
       - run:
-          name: Copy Qt plugin DLLs
+          name: Copy Qt imageformat plugin DLLs
           working_directory: /target/plugins
           command: >
             cp
             imageformats/qgif.dll
             imageformats/qjpeg.dll
             $CIRCLE_WORKING_DIRECTORY/dist/windows/imageformats
+      - run: mkdir dist/windows/platforms
+      - run:
+          name: Copy Qt platforms plugin DLLs
+          working_directory: /target/plugins
+          command: >
+            cp
+            platforms/qwindows.dll
+            $CIRCLE_WORKING_DIRECTORY/dist/windows/platforms
       - run: mkdir dist/windows/gio-modules
       - run:
           name: Copy GIO modules
diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in
index cba03572d..81e5a0b2c 100644
--- a/dist/windows/clementine.nsi.in
+++ b/dist/windows/clementine.nsi.in
@@ -407,6 +407,12 @@ Section "Qt image format plugins" imageformats
   File "/oname=qjpeg.dll" "imageformats\qjpeg.dll"
 SectionEnd
 
+Section "Qt platform plugins" platforms
+  SetOutPath "$INSTDIR\platforms"
+
+  File "/oname=qwindows.dll" "platforms\qwindows.dll"
+SectionEnd
+
 Section "GIO modules" gio-modules
   SetOutPath "$INSTDIR\gio-modules"