qml: don't import QtMultimedia when running on android (android 8 compat)

This commit is contained in:
Sander van Grieken
2026-02-18 16:20:39 +01:00
parent 9772a6d5b6
commit fd5b867689
2 changed files with 6 additions and 9 deletions
+4 -1
View File
@@ -6,7 +6,8 @@ import org.electrum
import "controls"
// currently not used on android, kept for future use when qt6 camera stops crashing
// currently not used on android, kept for testing on desktop, and future use
// on android when qt6 camera support becomes usable (i.e. stops crashing)
ElDialog {
id: scanDialog
@@ -50,4 +51,6 @@ ElDialog {
onClicked: doReject()
}
}
onClosed: destroy()
}
+2 -8
View File
@@ -7,7 +7,6 @@ import QtQuick.Controls.Material.impl
import QtQuick.Window
import QtQml
import QtMultimedia
import org.electrum 1.0
@@ -450,12 +449,6 @@ ApplicationWindow
onFinished: destroy()
}
}
Component {
id: _qtScanDialog
ScanDialog {
onClosed: destroy()
}
}
Component {
id: crashDialog
@@ -533,7 +526,8 @@ ApplicationWindow
if (AppController.isAndroid()) {
app.scanDialog = _scanDialog
} else {
app.scanDialog = _qtScanDialog
// for running on Desktop. uses QtMultimedia.
app.scanDialog = Qt.createComponent('ScanDialog.qml')
}
function continueWithServerConnection() {