From 3ac18a99779f17140fa7c13bb144af3c45fbefb5 Mon Sep 17 00:00:00 2001
From: mlangkabel <malte.langkabel@gmail.com>
Date: Fri, 5 Jan 2018 14:33:59 +0100
Subject: [PATCH] data: fixed sourcetrail loader gif not showing up on some
 windows systems

* added missing qt dlls to windows installer
---
 deployment/windows/wixSetup/installDir.wxs  | 21 ++++++++
 deployment/windows/wixSetup/sourcetrail.wxs |  7 +++
 script/setup.sh                             | 56 +++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index 8e37a089..8a95e113 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -252,12 +252,33 @@
 			</Directory>
 			
 			<Directory Id='Imageformats' Name='imageformats'>
+				<Component Id='QGifDll' Guid='*' Win64="$(var.Win64)">
+					<File Id='QGif' Name='qgif.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qgif.dll' KeyPath='yes' />
+				</Component>
+				<Component Id='QIcnsDll' Guid='*' Win64="$(var.Win64)">
+					<File Id='QIcns' Name='qicns.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qicns.dll' KeyPath='yes' />
+				</Component>
+				<Component Id='QIcoDll' Guid='*' Win64="$(var.Win64)">
+					<File Id='QIco' Name='qico.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qico.dll' KeyPath='yes' />
+				</Component>
 				<Component Id='QJpegDll' Guid='*' Win64="$(var.Win64)">
 					<File Id='QJpeg' Name='qjpeg.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qjpeg.dll' KeyPath='yes' />
 				</Component>
+				<Component Id='QSvgDll' Guid='*' Win64="$(var.Win64)">
+					<File Id='QSvg' Name='qsvg.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qsvg.dll' KeyPath='yes' />
+				</Component>
+				<Component Id='GTgaDll' Guid='*' Win64="$(var.Win64)">
+					<File Id='GTga' Name='qtga.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qtga.dll' KeyPath='yes' />
+				</Component>
+				<Component Id='QTiffDll' Guid='*' Win64="$(var.Win64)">
+					<File Id='QTiff' Name='qtiff.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qtiff.dll' KeyPath='yes' />
+				</Component>
 				<Component Id='QWBmpDll' Guid='*' Win64="$(var.Win64)">
 					<File Id='QWBmp' Name='qwbmp.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qwbmp.dll' KeyPath='yes' />
 				</Component>
+				<Component Id='QWebpDll' Guid='*' Win64="$(var.Win64)">
+					<File Id='QWebp' Name='qwebp.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qwebp.dll' KeyPath='yes' />
+				</Component>
 			</Directory>
 			
 			<Directory Id='License' Name='license'>
diff --git a/deployment/windows/wixSetup/sourcetrail.wxs b/deployment/windows/wixSetup/sourcetrail.wxs
index f61305e9..64571978 100644
--- a/deployment/windows/wixSetup/sourcetrail.wxs
+++ b/deployment/windows/wixSetup/sourcetrail.wxs
@@ -230,8 +230,15 @@
 				<ComponentRef Id='vcruntime140_dll'/>
 
 				<ComponentRef Id='QWindowsDll'/>
+				<ComponentRef Id='QGifDll'/>
+				<ComponentRef Id='QIcnsDll'/>
+				<ComponentRef Id='QIcoDll'/>
 				<ComponentRef Id='QJpegDll'/>
+				<ComponentRef Id='QSvgDll'/>
+				<ComponentRef Id='GTgaDll'/>
+				<ComponentRef Id='QTiffDll'/>
 				<ComponentRef Id='QWBmpDll'/>
+				<ComponentRef Id='QWebpDll'/>
 				
 				<ComponentRef Id='EulaRtf'/>
 				<ComponentRef Id='LicenseBoostTxt'/>
diff --git a/script/setup.sh b/script/setup.sh
index 8a92f794..1d83948e 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -75,8 +75,15 @@ if [ $PLATFORM == "Windows" ]; then
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Networkd.dll build/win32/Debug/app
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgetsd.dll build/win32/Debug/app
 	cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindowsd.dll build/win32/Debug/app/platforms
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qgifd.dll build/win32/Debug/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicnsd.dll build/win32/Debug/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicod.dll build/win32/Debug/app/imageformats
 	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qjpegd.dll build/win32/Debug/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qsvgd.dll build/win32/Debug/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qtgad.dll build/win32/Debug/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qtiffd.dll build/win32/Debug/app/imageformats
 	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwbmpd.dll build/win32/Debug/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwebpd.dll build/win32/Debug/app/imageformats
 	
 	cp -u -r setup/dynamic_libraries/win32/app/Release/* build/win32/Release/app
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Core.dll build/win32/Release/app
@@ -84,8 +91,15 @@ if [ $PLATFORM == "Windows" ]; then
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Network.dll build/win32/Release/app
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgets.dll build/win32/Release/app
 	cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindows.dll build/win32/Release/app/platforms
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qgif.dll build/win32/Release/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicns.dll build/win32/Release/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qico.dll build/win32/Release/app/imageformats
 	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qjpeg.dll build/win32/Release/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qsvg.dll build/win32/Release/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qtga.dll build/win32/Release/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qtiff.dll build/win32/Release/app/imageformats
 	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwbmp.dll build/win32/Release/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwebp.dll build/win32/Release/app/imageformats
 	
 	cp -u -r setup/dynamic_libraries/win64/app/Debug/* build/win64/Debug/app
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Cored.dll build/win64/Debug/app
@@ -93,8 +107,15 @@ if [ $PLATFORM == "Windows" ]; then
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Networkd.dll build/win64/Debug/app
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgetsd.dll build/win64/Debug/app
 	cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindowsd.dll build/win64/Debug/app/platforms
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qgifd.dll build/win64/Debug/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicnsd.dll build/win64/Debug/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicod.dll build/win64/Debug/app/imageformats
 	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qjpegd.dll build/win64/Debug/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qsvgd.dll build/win64/Debug/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qtgad.dll build/win64/Debug/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qtiffd.dll build/win64/Debug/app/imageformats
 	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwbmpd.dll build/win64/Debug/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwebpd.dll build/win64/Debug/app/imageformats
 	
 	cp -u -r setup/dynamic_libraries/win64/app/Release/* build/win64/Release/app
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Core.dll build/win64/Release/app
@@ -102,8 +123,15 @@ if [ $PLATFORM == "Windows" ]; then
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Network.dll build/win64/Release/app
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgets.dll build/win64/Release/app
 	cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindows.dll build/win64/Release/app/platforms
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qgif.dll build/win64/Release/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicns.dll build/win64/Release/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qico.dll build/win64/Release/app/imageformats
 	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qjpeg.dll build/win64/Release/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qsvg.dll build/win64/Release/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qtga.dll build/win64/Release/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qtiff.dll build/win64/Release/app/imageformats
 	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwbmp.dll build/win64/Release/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwebp.dll build/win64/Release/app/imageformats
 	
 	
 	echo -e $INFO "copy dynamic libraries for tests"
@@ -112,32 +140,60 @@ if [ $PLATFORM == "Windows" ]; then
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Networkd.dll build/win32/Debug/test
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgetsd.dll build/win32/Debug/test
 	cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindowsd.dll build/win32/Debug/test/platforms
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qgifd.dll build/win32/Debug/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicnsd.dll build/win32/Debug/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicod.dll build/win32/Debug/test/imageformats
 	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qjpegd.dll build/win32/Debug/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qsvgd.dll build/win32/Debug/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qtgad.dll build/win32/Debug/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qtiffd.dll build/win32/Debug/test/imageformats
 	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwbmpd.dll build/win32/Debug/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwebpd.dll build/win32/Debug/test/imageformats
 	
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Core.dll build/win32/Release/test
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Gui.dll build/win32/Release/test
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Network.dll build/win32/Release/test
 	cp -u -r ${QT_WIN32_DIR}/bin/Qt5Widgets.dll build/win32/Release/test
 	cp -u -r ${QT_WIN32_DIR}/plugins/platforms/qwindows.dll build/win32/Release/test/platforms
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qgif.dll build/win32/Release/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qicns.dll build/win32/Release/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qico.dll build/win32/Release/test/imageformats
 	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qjpeg.dll build/win32/Release/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qsvg.dll build/win32/Release/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qtga.dll build/win32/Release/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qtiff.dll build/win32/Release/test/imageformats
 	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwbmp.dll build/win32/Release/test/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwebp.dll build/win32/Release/test/imageformats
 	
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Cored.dll build/win64/Debug/test
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Guid.dll build/win64/Debug/test
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Networkd.dll build/win64/Debug/test
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgetsd.dll build/win64/Debug/test
 	cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindowsd.dll build/win64/Debug/test/platforms
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qgifd.dll build/win64/Debug/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicnsd.dll build/win64/Debug/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicod.dll build/win64/Debug/test/imageformats
 	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qjpegd.dll build/win64/Debug/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qsvgd.dll build/win64/Debug/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qtgad.dll build/win64/Debug/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qtiffd.dll build/win64/Debug/test/imageformats
 	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwbmpd.dll build/win64/Debug/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwebpd.dll build/win64/Debug/test/imageformats
 	
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Core.dll build/win64/Release/test
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Gui.dll build/win64/Release/test
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Network.dll build/win64/Release/test
 	cp -u -r ${QT_WIN64_DIR}/bin/Qt5Widgets.dll build/win64/Release/test
 	cp -u -r ${QT_WIN64_DIR}/plugins/platforms/qwindows.dll build/win64/Release/test/platforms
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qgif.dll build/win64/Release/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qicns.dll build/win64/Release/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qico.dll build/win64/Release/test/imageformats
 	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qjpeg.dll build/win64/Release/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qsvg.dll build/win64/Release/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qtga.dll build/win64/Release/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qtiff.dll build/win64/Release/test/imageformats
 	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwbmp.dll build/win64/Release/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwebp.dll build/win64/Release/test/imageformats
 
 	echo -e $INFO "copy test_main file"
 	cp -u setup/cxx_test/windows/test_main.cpp build/win32