aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/windows
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-29 13:42:06 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-29 20:43:26 -0700
commit04f8eee46c98024e3b7e1032d6f296adb3aeaa22 (patch)
treed8258700509b12e438e25a03fb57ddc8aa28b7c0 /packaging/windows
parent0021f24eef812313484a2dfb20fa400bd190d1c4 (diff)
downloadsubsurface-04f8eee46c98024e3b7e1032d6f296adb3aeaa22.tar.gz
MXE build: copy the QML modules we need
And include them in the installer. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/windows')
-rwxr-xr-xpackaging/windows/mxe-based-build.sh12
-rw-r--r--packaging/windows/subsurface.nsi.in1
2 files changed, 13 insertions, 0 deletions
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index 31337a9b6..24c4825e8 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -286,6 +286,18 @@ do
done
done
+# next we need the QML modules
+QT_QML_MODULES="$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/qml/QtQuick.2 \
+$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/qml/QtLocation \
+$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/qml/QtPositioning"
+
+mkdir -p $STAGING_DIR/qml
+
+for d in $QT_QML_MODULES
+do
+ cp -a $d $STAGING_DIR/qml
+done
+
# for some reason we aren't installing Qt5Xml.dll and Qt5Location.dll
# I need to figure out why and fix that, but for now just manually copy that as well
EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Xml$DLL_SUFFIX.dll \
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
index 2d8e57042..75d9a2a1e 100644
--- a/packaging/windows/subsurface.nsi.in
+++ b/packaging/windows/subsurface.nsi.in
@@ -150,6 +150,7 @@ Section
File /r theme
File /r images
File /r plugins
+ File /r qml
File /r Documentation
File /r translations
File /r printing_templates