diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-20 13:19:36 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-20 13:20:44 +0200 |
| commit | ee8aca6c8771a92d558003ea5cf62e5236f21bb5 (patch) | |
| tree | af9524ab0ee20930181f590fc6b3fb495028e7fd /src/multimedia/video | |
| parent | f5235af0dc3aa433435dbd42b716776097af5acf (diff) | |
| parent | 3d3d2a4967ba079a3e6df82cdc89f839865e6649 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie1e478eca1cdfd99ccd3a3c8a07aefbfa27ccbdb
Diffstat (limited to 'src/multimedia/video')
| -rw-r--r-- | src/multimedia/video/qvideooutputorientationhandler_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/video/qvideooutputorientationhandler_p.h b/src/multimedia/video/qvideooutputorientationhandler_p.h index 252ee2920..c690cafae 100644 --- a/src/multimedia/video/qvideooutputorientationhandler_p.h +++ b/src/multimedia/video/qvideooutputorientationhandler_p.h @@ -59,10 +59,10 @@ public: int currentOrientation() const; -signals: +Q_SIGNALS: void orientationChanged(int angle); -private slots: +private Q_SLOTS: void screenOrientationChanged(Qt::ScreenOrientation orientation); private: |