Merge pull request #10400 from f321x/fix_qml_type_error
qml: add close no-op to QEQRScanner to fix type error
This commit is contained in:
@@ -56,6 +56,11 @@ class QEQRScanner(QObject):
|
|||||||
activity.bind(on_activity_result=self.on_qr_activity_result)
|
activity.bind(on_activity_result=self.on_qr_activity_result)
|
||||||
jpythonActivity.startActivityForResult(intent, 0)
|
jpythonActivity.startActivityForResult(intent, 0)
|
||||||
|
|
||||||
|
@pyqtSlot()
|
||||||
|
def close(self):
|
||||||
|
# no-op to prevent qml type error
|
||||||
|
pass
|
||||||
|
|
||||||
def on_qr_activity_result(self, requestCode, resultCode, intent):
|
def on_qr_activity_result(self, requestCode, resultCode, intent):
|
||||||
try:
|
try:
|
||||||
if resultCode == -1: # RESULT_OK:
|
if resultCode == -1: # RESULT_OK:
|
||||||
|
|||||||
Reference in New Issue
Block a user