ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

data: make Qt Windows Vista style available for windows 10

Browse Source
This commit is contained in:
mlangkabel
2019-08-06 10:55:50 +02:00
parent 6a3561cb87
commit 21f25a0b00
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/wixSetup/installDir.wxs
+8 -2
View File
@@ -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>
deployment/windows/wixSetup/sourcetrail.wxs
+2 -1
View File
@@ -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'/>
script/setup.sh
+2
View File
@@ -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
src/app/main.cpp
+2
View File
@@ -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;