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

Change-Id: I4167d268505cbc0b7b57888928670ae05302f4cb

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.

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