Merge 9bd1631103 into c72a26afe1

mobile-widgets/qml/DiveDetails.qml

@@ -399,8 +399,6 @@ Kirigami.Page {
 			delegate: Flickable {
 				id: internalScrollView
 				width: diveDetailsListView.width
-				height: diveDetailsListView.height
-				contentHeight: diveDetails.height
 				boundsBehavior: Flickable.StopAtBounds
 				property var modelData: model
 				DiveDetailsView {
@@ -425,7 +423,6 @@ Kirigami.Page {
 		anchors.fill: parent
 		leftMargin: Kirigami.Units.smallSpacing
 		rightMargin: Kirigami.Units.smallSpacing
-		contentHeight: detailsEdit.height
 		// start invisible and scaled down, to get the transition
 		// off to the right start
 		visible: false

packaging/windows/in-container-build.sh

@@ -13,7 +13,7 @@ set -e
 mkdir -p win32
 cd win32
 
-# build Subsurface
+# build Subsurface and then smtk2ssrf
 export MXEBUILDTYPE=x86_64-w64-mingw32.shared
 bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer
 
@@ -23,10 +23,6 @@ mv subsurface/subsurface.exe* ${OUTPUT_DIR}/
 fullname=$(cd subsurface ; ls subsurface-*.exe)
 mv subsurface/"$fullname" ${OUTPUT_DIR}/"${fullname%.exe}-installer.exe"
 
-# build Subsurface for smtk2ssrf
-
-bash -ex ../subsurface/packaging/windows/mxe-based-build.sh -noftdi -nolibraw subsurface
-
 bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh -a -i
 
 # the strange two step move is in order to get predictable names to use

packaging/windows/mxe-based-build.sh

@@ -27,16 +27,12 @@
 #
 # now you can start the build
 #
-# make libxml2 libxslt libusb1 libzip libssh2 libftdi1 libraw curl qt5 nsis
+# make libxml2 libxslt libusb1 libzip libssh2 libftdi1 curl qt5 nsis
 #
 #     (if you intend to build Subsurface without user space FTDI support
 #      you can drop libftdi1 from that list and start this script with
 #      -noftdi )
 #
-#     (if you intend to build Subsurface without libraw support
-#      you can drop libraw from that list and start this script with
-#      -nolibraw )
-#
 # After quite a while (depending on your machine anywhere from 15-20
 # minutes to several hours) you should have a working MXE install in
 # ~/src/mxe
@@ -97,13 +93,6 @@ else
 	FTDI="ON"
 fi
 
-if [[ "$1" == "-nolibraw" ]] ; then
-	shift
-	LIBRAW="OFF"
-else
-	LIBRAW="ON"
-fi
-
 # this is run on a rather powerful machine - if you want less
 # build parallelism, please change this variable
 JOBS="-j4"
@@ -303,7 +292,6 @@ cd "$BUILDDIR"/subsurface
 	-DMAKE_TESTS=OFF \
 	-DBTSUPPORT=ON -DBLESUPPORT=ON \
 	-DFTDISUPPORT=$FTDI \
-	-DLIBRAW_SUPPORT=$LIBRAW \
 	-DLIBGIT2_FROM_PKGCONFIG=ON \
 	"$BASEDIR"/subsurface