diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:41:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:51:45 +0200 |
| commit | d850748283698596327653ec30decdbd6c964af8 (patch) | |
| tree | 6efc71e7877294fb616f88f1f17f089d4dce1b84 /examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py | |
| parent | 46ff21ee14e00b992b49562943274d62f2b5b456 (diff) | |
| parent | ffae5fe2f3312fdad7ef5880308dae4fd31fec94 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib2eeca97ebabcff53ef7ddd9fc769be6424db39f
Diffstat (limited to 'examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py')
| -rw-r--r-- | examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py index 841943292..32adb70c7 100644 --- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py +++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py @@ -75,7 +75,7 @@ class MainWindow(QtWidgets.QMainWindow): if fileName!="": inFile = QtCore.QFile(fileName) if inFile.open(QtCore.QFile.ReadOnly | QtCore.QFile.Text): - self.editor.setPlainText(unicode(inFile.readAll())) + self.editor.setPlainText(str(inFile.readAll())) def setupEditor(self): variableFormat = QtGui.QTextCharFormat() |