diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-19 11:55:10 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-03 15:40:57 +0000 |
commit | ceeb82693a0240b1dd4f51605ba21413927ee558 (patch) | |
tree | 8363fe26b1f00823ff0b8f4c2d7af38bc3e4d087 /examples/opengl | |
parent | 0eec9fecd241a178ca8f09218b9286ae763f29b3 (diff) |
Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6
Test failures:
shiboken2:testmodifyfunction
pyside2:QtCore::qbytearray_test
pyside2:QtGui::bug_PYSIDE-41
pyside2:QtGui::deepcopy_test
pyside2:QtGui::qfontmetrics_test
pyside2:QtGui::qpixmapcache_test
pyside2:QtWidgets::api2_test (QTBUG-85417)
pyside2:QtWidgets::bug_632
pyside2:QtWidgets::bug_714
pyside2:QtWidgets::bug_785
pyside2:QtWidgets::qshortcut_test
pyside2:QtQml::bug_825
pyside2:QtQml::bug_1029
pyside2:QtQml::registertype
pyside2:QtQml::qqmlincubator_incubateWhile
pyside2:QtQml::signal_arguments
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples/opengl')
-rw-r--r-- | examples/opengl/grabber.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/opengl/grabber.py b/examples/opengl/grabber.py index d4b625718..9b5358a85 100644 --- a/examples/opengl/grabber.py +++ b/examples/opengl/grabber.py @@ -355,21 +355,21 @@ class MainWindow(QtWidgets.QMainWindow): "rendering OpenGL into a Qt pixmap.") def createActions(self): - self.renderIntoPixmapAct = QtWidgets.QAction("&Render into Pixmap...", + self.renderIntoPixmapAct = QtGui.QAction("&Render into Pixmap...", self, shortcut="Ctrl+R", triggered=self.renderIntoPixmap) - self.grabFrameBufferAct = QtWidgets.QAction("&Grab Frame Buffer", self, + self.grabFrameBufferAct = QtGui.QAction("&Grab Frame Buffer", self, shortcut="Ctrl+G", triggered=self.grabFrameBuffer) - self.clearPixmapAct = QtWidgets.QAction("&Clear Pixmap", self, + self.clearPixmapAct = QtGui.QAction("&Clear Pixmap", self, shortcut="Ctrl+L", triggered=self.clearPixmap) - self.exitAct = QtWidgets.QAction("E&xit", self, shortcut="Ctrl+Q", + self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q", triggered=self.close) - self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about) + self.aboutAct = QtGui.QAction("&About", self, triggered=self.about) - self.aboutQtAct = QtWidgets.QAction("About &Qt", self, + self.aboutQtAct = QtGui.QAction("About &Qt", self, triggered=qApp.aboutQt) def createMenus(self): |