aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-03-25 15:26:13 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-03-25 15:26:16 +0100
commitd165ebc219502a8ee4202622240d7358935e9d18 (patch)
treeb7593dd94e3356d4db50564e958ff6578b1abf07 /examples
parent0829139d8895f8d23c4d8d4105cfac2464994483 (diff)
parent24eaef7c220766d36eda84b073ba78af8e82673e (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'examples')
-rw-r--r--examples/widgets/dialogs/standarddialogs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/dialogs/standarddialogs.py b/examples/widgets/dialogs/standarddialogs.py
index 872e08ed..f61157e7 100644
--- a/examples/widgets/dialogs/standarddialogs.py
+++ b/examples/widgets/dialogs/standarddialogs.py
@@ -216,7 +216,7 @@ class Dialog(QtWidgets.QDialog):
self.colorLabel.setAutoFillBackground(True)
def setFont(self):
- font, ok = QtWidgets.QFontDialog.getFont(QtGui.QFont(self.fontLabel.text()), self)
+ ok, font = QtWidgets.QFontDialog.getFont(QtGui.QFont(self.fontLabel.text()), self)
if ok:
self.fontLabel.setText(font.key())
self.fontLabel.setFont(font)