From 21f25a0b00538d43d91d772a4bc498a821545511 Mon Sep 17 00:00:00 2001
From: mlangkabel <malte.langkabel@gmail.com>
Date: Tue, 6 Aug 2019 10:55:50 +0200
Subject: [PATCH] data: make Qt Windows Vista style available for windows 10

---
 deployment/windows/wixSetup/installDir.wxs  | 10 ++++++++--
 deployment/windows/wixSetup/sourcetrail.wxs |  3 ++-
 script/setup.sh                             |  2 ++
 src/app/main.cpp                            |  2 ++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index a92d2d9f..c1e7e23c 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -252,8 +252,14 @@
 			</Component>
 
 			<Directory Id='Platforms' Name='platforms'>
-				<Component Id='QWindowsDll' Guid='*' Win64="$(var.Win64)">
-					<File Id='qwindowsDLL' Name='qwindows.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/platforms/qwindows.dll' KeyPath='yes' />
+				<Component Id='qwindows_dll' Guid='*' Win64="$(var.Win64)">
+					<File Id='qwindows' Name='qwindows.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/platforms/qwindows.dll' KeyPath='yes' />
+				</Component>
+			</Directory>
+
+			<Directory Id='Styles' Name='styles'>
+				<Component Id='qwindowsvistastyle_dll' Guid='*' Win64="$(var.Win64)">
+					<File Id='qwindowsvistastyle' Name='qwindowsvistastyle.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/styles/qwindowsvistastyle.dll' KeyPath='yes' />
 				</Component>
 			</Directory>
 
diff --git a/deployment/windows/wixSetup/sourcetrail.wxs b/deployment/windows/wixSetup/sourcetrail.wxs
index fb086590..1fa75f9e 100644
--- a/deployment/windows/wixSetup/sourcetrail.wxs
+++ b/deployment/windows/wixSetup/sourcetrail.wxs
@@ -228,7 +228,8 @@
 				<ComponentRef Id='ucrtbaseDll'/>
 				<ComponentRef Id='vcruntime140_dll'/>
 
-				<ComponentRef Id='QWindowsDll'/>
+				<ComponentRef Id='qwindows_dll'/>
+				<ComponentRef Id='qwindowsvistastyle_dll'/>
 				<ComponentRef Id='QGifDll'/>
 				<ComponentRef Id='QIcnsDll'/>
 				<ComponentRef Id='QIcoDll'/>
diff --git a/script/setup.sh b/script/setup.sh
index da70c429..5c92c91f 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -46,6 +46,7 @@ if [ $PLATFORM == "Windows" ]; then
 	copy_dynamic_libraries() # Parameters: bit {32, 64}, mode {Debug, Release}, target {app, test}
 	{
 		mkdir -p build/win$1/$2/$3/platforms
+		mkdir -p build/win$1/$2/$3/styles
 		mkdir -p build/win$1/$2/$3/imageformats
 		
 		local QT_DIR=${QT_WIN32_DIR}
@@ -75,6 +76,7 @@ if [ $PLATFORM == "Windows" ]; then
 		cp -u -r ${QT_DIR}/bin/Qt5Widgets$SUFFIX.dll build/win$1/$2/$3
 		cp -u -r ${QT_DIR}/bin/Qt5WinExtras$SUFFIX.dll build/win$1/$2/$3
 		cp -u -r ${QT_DIR}/plugins/platforms/qwindows$SUFFIX.dll build/win$1/$2/$3/platforms
+		cp -u -r ${QT_DIR}/plugins/styles/qwindowsvistastyle$SUFFIX.dll build/win$1/$2/$3/styles
 		cp -u -r ${QT_DIR}/plugins/imageformats/qgif$SUFFIX.dll build/win$1/$2/$3/imageformats
 		cp -u -r ${QT_DIR}/plugins/imageformats/qicns$SUFFIX.dll build/win$1/$2/$3/imageformats
 		cp -u -r ${QT_DIR}/plugins/imageformats/qico$SUFFIX.dll build/win$1/$2/$3/imageformats
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 24226b84..a1bd29c4 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -82,6 +82,8 @@ QCoreApplication* createApplication(int &argc, char *argv[], bool noGUI = false)
 
 int main(int argc, char *argv[])
 {
+	QCoreApplication::addLibraryPath(".");
+
 	if (utility::getOsType() == OS_LINUX && std::getenv("SOURCETRAIL_VIA_SCRIPT") == nullptr)
 	{
 		std::cout << "ERROR: Please run Sourcetrail via the Sourcetrail.sh script!" << std::endl;