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 /sources/pyside2/tests/QtOpenGL/qglbuffer_test.py | |
| parent | 46ff21ee14e00b992b49562943274d62f2b5b456 (diff) | |
| parent | ffae5fe2f3312fdad7ef5880308dae4fd31fec94 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib2eeca97ebabcff53ef7ddd9fc769be6424db39f
Diffstat (limited to 'sources/pyside2/tests/QtOpenGL/qglbuffer_test.py')
| -rw-r--r-- | sources/pyside2/tests/QtOpenGL/qglbuffer_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py b/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py index 1ec033471..07e028eff 100644 --- a/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py +++ b/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py @@ -49,7 +49,7 @@ class QGLBufferTest(UsesQApplication): self.assertTrue(b.bufferId() != 0) self.assertTrue(b.bind()) - data = QByteArray("12345") + data = QByteArray(py3k.b("12345")) b.allocate(data) self.assertEqual(b.size(), data.size()) |