diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:53:41 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:53:41 +0100 |
| commit | 47698fc57fbc66f4b2921eeedb9cb8e71f8fb2d9 (patch) | |
| tree | ed7cd0b18c15f8ec57c26011e5aa3dddb15bdb5d /src/multimedia | |
| parent | aa38d3dfb16e76e8e2ce2d270020a6cb5cc8d3e9 (diff) | |
| parent | a864bfa4129f27f744ad223bbd14460afc049670 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I31e377cdccf8bf5c1ea8143faf2001ac99608c27
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h | 1 | ||||
| -rw-r--r-- | src/multimedia/video/qvideooutputorientationhandler.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h index 4e77b8d78..e1dbf5646 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h @@ -119,6 +119,7 @@ protected: private Q_SLOTS: void _q_updateMediaObject(); + void _q_updateCameraInfo(); void _q_updateNativeSize(); void _q_updateGeometry(); void _q_screenOrientationChanged(int); diff --git a/src/multimedia/video/qvideooutputorientationhandler.cpp b/src/multimedia/video/qvideooutputorientationhandler.cpp index e6fa0a180..f50f8f451 100644 --- a/src/multimedia/video/qvideooutputorientationhandler.cpp +++ b/src/multimedia/video/qvideooutputorientationhandler.cpp @@ -35,7 +35,6 @@ #include <QGuiApplication> #include <QScreen> -#include <qpa/qplatformscreen.h> QT_BEGIN_NAMESPACE @@ -63,9 +62,8 @@ int QVideoOutputOrientationHandler::currentOrientation() const void QVideoOutputOrientationHandler::screenOrientationChanged(Qt::ScreenOrientation orientation) { const QScreen *screen = QGuiApplication::primaryScreen(); - const QPlatformScreen *platformScreen = screen->handle(); - const int angle = (360 - screen->angleBetween(platformScreen->nativeOrientation(), orientation)) % 360; + const int angle = (360 - screen->angleBetween(screen->nativeOrientation(), orientation)) % 360; if (angle == m_currentOrientation) return; |