diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-14 11:07:51 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-14 17:37:57 +0200 |
| commit | 812fa2f59853fa693b77c04d4afaaee722931029 (patch) | |
| tree | 49d5186d0c7eaa9c6c24acb8f3b254e76cfe5152 /examples/multimedia | |
| parent | 4bc6eb21e032b9523424ea1316440b9d6ad7c8d7 (diff) | |
Re-add QtMultimedia/Widgets
Fix it to build with
qtmultimedia/9a4822037def3b9d48abea8bbfd7ea20fd19849b (wip/qt6).
Remove typesystem_multimedia_forward_declarations.xml as the forward
declarations of QVideoWidget and QGraphicsVideoItem no longer exist.
Fix the tests.
Fix the player example to run/crash.
Pick-to: 6.1
Task-number: PYSIDE-1482
Change-Id: I340693e3510347f95b55395985bd2b0f294769a1
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'examples/multimedia')
| -rw-r--r-- | examples/multimedia/player/player.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/multimedia/player/player.py b/examples/multimedia/player/player.py index b2adebb5c..44df8853b 100644 --- a/examples/multimedia/player/player.py +++ b/examples/multimedia/player/player.py @@ -43,7 +43,7 @@ import sys from PySide6.QtCore import QStandardPaths, Qt -from PySide6.QtGui import QAction, QIcon, QKeySequence +from PySide6.QtGui import QAction, QIcon, QKeySequence, QScreen from PySide6.QtWidgets import (QApplication, QDialog, QFileDialog, QMainWindow, QSlider, QStyle, QToolBar) from PySide6.QtMultimedia import QMediaPlayer, QMediaPlaylist @@ -100,7 +100,7 @@ class MainWindow(QMainWindow): self.volumeSlider.setOrientation(Qt.Horizontal) self.volumeSlider.setMinimum(0) self.volumeSlider.setMaximum(100) - self.volumeSlider.setFixedWidth(app.desktop().availableGeometry(self).width() / 10) + self.volumeSlider.setFixedWidth(self.screen().availableGeometry().width() / 10) self.volumeSlider.setValue(self.player.volume()) self.volumeSlider.setTickInterval(10) self.volumeSlider.setTickPosition(QSlider.TicksBelow) @@ -153,7 +153,7 @@ class MainWindow(QMainWindow): if __name__ == '__main__': app = QApplication(sys.argv) mainWin = MainWindow() - availableGeometry = app.desktop().availableGeometry(mainWin) + availableGeometry = mainWin.screen().availableGeometry() mainWin.resize(availableGeometry.width() / 3, availableGeometry.height() / 2) mainWin.show() sys.exit(app.exec()) |