From 1f0acad07c5551c80e16583c5f39339fe8d3bbcb Mon Sep 17 00:00:00 2001
From: Karim ElDeeb <keldeeb@gmail.com>
Date: Sun, 25 Nov 2018 02:09:01 +0200
Subject: [PATCH] Remove the bearer plugin from the 32-bit build

The 32-bit version is built using Qt 5.7 and it doesn't look like it needs this plugin. It will be included in 64-bit builds only.

See #1592.
---
 installer/windows/product.wxs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/installer/windows/product.wxs b/installer/windows/product.wxs
index 05b5651d..58cd64ab 100644
--- a/installer/windows/product.wxs
+++ b/installer/windows/product.wxs
@@ -62,9 +62,12 @@
                         <Component><File Source="$(var.QtPath)\plugins\styles\qwindowsvistastyle.dll" /></Component>
                     </Directory>
                     <?endif?>
+                    <!-- This plugin is not needed for the 32-bit version which is built with Qt 5.7. -->
+                    <?if $(sys.BUILDARCH)="x64"?>
                     <Directory Id="bearer" Name="bearer">
                         <Component><File Source="$(var.QtPath)\plugins\bearer\qgenericbearer.dll" /></Component>
                     </Directory>
+                    <?endif?>
                     <Directory Id="imageformats" Name="imageformats">
                         <Component><File Source="$(var.QtPath)\plugins\imageformats\qgif.dll" /></Component>
                         <Component><File Source="$(var.QtPath)\plugins\imageformats\qicns.dll" /></Component>
@@ -135,7 +138,9 @@
             </Feature>
 
             <!-- Bearer -->
+            <?if $(sys.BUILDARCH)="x64"?>
             <ComponentRef Id="qgenericbearer.dll" />
+            <?endif?>
             <!-- Plugins -->
             <ComponentRef Id="qgif.dll" />
             <ComponentRef Id="qicns.dll" />