From 2006513169e4e6c52d081eaadafd22d40790b9b4 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Fri, 9 Oct 2020 14:29:30 +0300 Subject: packaging/windows: add the /styles folder For Windows, the Subsurface installers do not include the file "qwindowsvistastyle.dll" required to make the applications that are published to have a native look. Modify the MXE *build.sh scripts to include the file as "plugins/styles/qwindowsvistastyle.dll". Signed-off-by: Lubomir I. Ivanov --- packaging/windows/mxe-based-build.sh | 1 + packaging/windows/smtk2ssrf-mxe-build.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index f57af68b5..d15b90c12 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -206,6 +206,7 @@ QT_PLUGIN_DIRECTORIES="$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/iconen $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/imageformats \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/platforms \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/geoservices \ +$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/styles \ $BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/plugins/printsupport" STAGING_DIR=$BUILDDIR/subsurface/staging diff --git a/packaging/windows/smtk2ssrf-mxe-build.sh b/packaging/windows/smtk2ssrf-mxe-build.sh index 170394493..a1db2a05c 100755 --- a/packaging/windows/smtk2ssrf-mxe-build.sh +++ b/packaging/windows/smtk2ssrf-mxe-build.sh @@ -170,6 +170,7 @@ mkdir -p smtk-import && echo -e "$BLUE---> Created new$LIGHT_GRAY $BUILDDIR/smtk # first copy the Qt plugins in place QT_PLUGIN_DIRECTORIES="$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/iconengines \ $BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/imageformats \ +$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/styles \ $BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms" # This comes from subsurface's mxe-based-build.sh. I'm not sure it is necessary -- cgit v1.2.3-70-g09d2