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

Conflicts:
	examples/examples.pro
	qmake/library/qmakebuiltins.cpp
	src/corelib/global/qglobal.cpp
		Re-apply b525ec2 to qrandom.cpp(code movement in 030782e)
	src/corelib/global/qnamespace.qdoc
	src/corelib/global/qrandom.cpp
	src/gui/kernel/qwindow.cpp
		Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08)
	src/network/ssl/qsslkey_openssl.cpp
	src/plugins/platforms/android/androidjniinput.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/widgets/widgets/qmenu.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp

Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 2ff9fb4e36..d5e8b1b974 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -1017,7 +1017,7 @@ QList<QByteArray> QMovie::supportedFormats()
 
     const auto doesntSupportAnimation =
             [&buffer](const QByteArray &format) {
-                return !QImageReader(&buffer, format).supportsAnimation();
+                return !QImageReader(&buffer, format).supportsOption(QImageIOHandler::Animation);
             };
 
     list.erase(std::remove_if(list.begin(), list.end(), doesntSupportAnimation), list.end());