diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index e2e402ad..daa9be13 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -251,6 +251,15 @@
 				</Component>
 			</Directory>
 			
+			<Directory Id='Imageformats' Name='imageformats'>
+				<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='QWBmpDll' Guid='*' Win64="$(var.Win64)">
+					<File Id='QWBmp' Name='qwbmp.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/imageformats/qwbmp.dll' KeyPath='yes' />
+				</Component>
+			</Directory>
+			
 			<Directory Id='License' Name='license'>
 				<Component Id='EulaRtf' Guid='*' Win64="$(var.Win64)">
 					<File Id='EulaRtfId' Name='EULA.rtf' DiskId='1' Source='./../../../bin/app/data/gui/installer/EULA.rtf' KeyPath='yes' />
diff --git a/deployment/windows/wixSetup/sourcetrail.wxs b/deployment/windows/wixSetup/sourcetrail.wxs
index 46191330..5342582a 100644
--- a/deployment/windows/wixSetup/sourcetrail.wxs
+++ b/deployment/windows/wixSetup/sourcetrail.wxs
@@ -230,6 +230,8 @@
 				<ComponentRef Id='vcruntime140_dll'/>
 
 				<ComponentRef Id='QWindowsDll'/>
+				<ComponentRef Id='QJpegDll'/>
+				<ComponentRef Id='QWBmpDll'/>
 				
 				<ComponentRef Id='EulaRtf'/>
 				<ComponentRef Id='LicenseBoostTxt'/>
diff --git a/script/setup.sh b/script/setup.sh
index 65968aa8..8a92f794 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -44,13 +44,21 @@ fi
 echo -e $INFO "create build folders"
 if [ $PLATFORM == "Windows" ]; then
 	mkdir -p build/win32/Debug/app/platforms
+	mkdir -p build/win32/Debug/app/imageformats
 	mkdir -p build/win32/Debug/test/platforms
+	mkdir -p build/win32/Debug/test/imageformats
 	mkdir -p build/win32/Release/app/platforms
+	mkdir -p build/win32/Release/app/imageformats
 	mkdir -p build/win32/Release/test/platforms
+	mkdir -p build/win32/Release/test/imageformats
 	mkdir -p build/win64/Debug/app/platforms
+	mkdir -p build/win64/Debug/app/imageformats
 	mkdir -p build/win64/Debug/test/platforms
+	mkdir -p build/win64/Debug/test/imageformats
 	mkdir -p build/win64/Release/app/platforms
+	mkdir -p build/win64/Release/app/imageformats
 	mkdir -p build/win64/Release/test/platforms
+	mkdir -p build/win64/Release/test/imageformats
 else
 	mkdir -p build/Debug/app
 	mkdir -p build/Debug/test
@@ -67,6 +75,8 @@ 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/qjpegd.dll build/win32/Debug/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwbmpd.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
@@ -74,6 +84,8 @@ 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/qjpeg.dll build/win32/Release/app/imageformats
+	cp -u -r ${QT_WIN32_DIR}/plugins/imageformats/qwbmp.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
@@ -81,6 +93,8 @@ 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/qjpegd.dll build/win64/Debug/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwbmpd.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
@@ -88,6 +102,8 @@ 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/qjpeg.dll build/win64/Release/app/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwbmp.dll build/win64/Release/app/imageformats
 	
 	
 	echo -e $INFO "copy dynamic libraries for tests"
@@ -96,24 +112,32 @@ 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/qjpegd.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}/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/qjpeg.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_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/qjpegd.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}/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/qjpeg.dll build/win64/Release/test/imageformats
+	cp -u -r ${QT_WIN64_DIR}/plugins/imageformats/qwbmp.dll build/win64/Release/test/imageformats
 
 	echo -e $INFO "copy test_main file"
 	cp -u setup/cxx_test/windows/test_main.cpp build/win32