diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 21:28:00 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-10 21:28:00 +0000 |
commit | 13b24ab18b13c788f7cd5788303d2a226353e70d (patch) | |
tree | 3d7c693d4a6c799a8b290dbfeb048e3f849c28b7 | |
parent | b1a2b3f55ef1220a58b1a609582774c4829ff06f (diff) | |
parent | 9e936128904625613e0e73fbbd8fc6a48c10e0bd (diff) |
Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4
-rw-r--r-- | dist/changes-5.4.1 | 49 | ||||
-rw-r--r-- | src/plugins/directshow/directshow.pro | 2 |
2 files changed, 50 insertions, 1 deletions
diff --git a/dist/changes-5.4.1 b/dist/changes-5.4.1 new file mode 100644 index 000000000..7175885b8 --- /dev/null +++ b/dist/changes-5.4.1 @@ -0,0 +1,49 @@ +Qt 5.4.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.4.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.4 + +The Qt version 5.4 series is binary compatible with the 5.3.x series. +Applications compiled for 5.3 will continue to run with 5.4. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + +QtMultimedia +------------ + + - VideoOutput's autoOrientation property now correctly works after + switching cameras. + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Android +------- + + - [QTBUG-42159] QAudioInput::setVolume() is now functioning. + +Linux +----- + + - [QTBUG-43514] Fixed static linking. + + WinRT +----- + + - [QTBUG-41066] Fix VideoOutput autoOrientation when used with a Camera. + - [QTBUG-41065] Show Camera viewfinder frames in a resolution adapted to + the current capture mode. diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 5b59ccfe0..7815927db 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -1,5 +1,5 @@ TARGET = dsengine -win32:!qtHaveModule(opengl) { +win32:!qtHaveModule(opengl)|contains(QT_CONFIG,dynamicgl) { LIBS_PRIVATE += -lgdi32 -luser32 } PLUGIN_TYPE=mediaservice |