slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.4' into dev

Browse Source 
Conflicts:
	.qmake.conf

Change-Id: I31e377cdccf8bf5c1ea8143faf2001ac99608c27
This commit is contained in:
Frederik Gladhorn
2014-12-17 16:53:41 +01:00
parent aa38d3dfb1 a864bfa412
commit 47698fc57f
12 changed files with 223 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h
View File

@@ -119,6 +119,7 @@ protected:
private Q_SLOTS:
void _q_updateMediaObject();
void _q_updateCameraInfo();
void _q_updateNativeSize();
void _q_updateGeometry();
void _q_screenOrientationChanged(int);

4
src/multimedia/video/qvideooutputorientationhandler.cpp
View File

@@ -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;