[vlc-commits] Contribs: update to Qt 5.6.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Mar 16 18:15:33 2016 +0100| [36a9c9b39b567bddbd3c3695310ac358f343c5e7] | committer: Jean-Baptiste Kempf

Contribs: update to Qt 5.6.0

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=36a9c9b39b567bddbd3c3695310ac358f343c5e7
---

 contrib/src/qt/SHA512SUMS      |    2 +-
 contrib/src/qt/Win32-AOT.patch |   11 -----------
 contrib/src/qt/rules.mak       |    8 +++-----
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/contrib/src/qt/SHA512SUMS b/contrib/src/qt/SHA512SUMS
index 7096b54..f7c167b 100644
--- a/contrib/src/qt/SHA512SUMS
+++ b/contrib/src/qt/SHA512SUMS
@@ -1 +1 @@
-8002c9bf6f6e81dcab1c6b4cd09a9c7e578fa16a65e2e898e536a0f89e8ec563fe943e9d77094bcc5e26383b14c848f11d008ab9ba0f7e3c3716628db6eabc42  qt-5.3.0.tar.xz
+5b2a5842346475be0944fc44bc09ff5b5d5da167246310de132f034e17ebbcbbf103b6f085dbf8b566389694bd095227aa1ed569b93e0f9a8f02da51d8fe076e  qt-5.6.0.tar.xz
diff --git a/contrib/src/qt/Win32-AOT.patch b/contrib/src/qt/Win32-AOT.patch
deleted file mode 100644
index 145235b..0000000
--- a/contrib/src/qt/Win32-AOT.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt/src/plugins/platforms/windows/qwindowswindow.cpp.old	2015-02-15 21:05:36.302825488 +0100
-+++ qt/src/plugins/platforms/windows/qwindowswindow.cpp	2015-02-15 21:06:11.562824592 +0100
-@@ -651,7 +651,7 @@
-         } else if (flags & Qt::WindowStaysOnBottomHint) {
-             SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, swpFlags);
-         } else if (frameChange) { // Force WM_NCCALCSIZE with wParam=1 in case of custom margins.
--            SetWindowPos(hwnd, 0, 0, 0, 0, 0, swpFlags);
-+            SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, swpFlags);
-         }
-         if (flags & (Qt::CustomizeWindowHint|Qt::WindowTitleHint)) {
-             HMENU systemMenu = GetSystemMenu(hwnd, FALSE);
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index ebf6f70..06211fe 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -1,7 +1,7 @@
 # qt
 
-QT_VERSION = 5.3.0
-QT_URL := http://download.qt-project.org/official_releases/qt/5.3/$(QT_VERSION)/submodules/qtbase-opensource-src-$(QT_VERSION).tar.xz
+QT_VERSION = 5.6.0
+QT_URL := https://download.qt.io/official_releases/qt/5.6/$(QT_VERSION)/submodules/qtbase-opensource-src-$(QT_VERSION).tar.xz
 
 ifdef HAVE_MACOSX
 #PKGS += qt
@@ -24,7 +24,6 @@ $(TARBALLS)/qt-$(QT_VERSION).tar.xz:
 qt: qt-$(QT_VERSION).tar.xz .sum-qt
 	$(UNPACK)
 	mv qtbase-opensource-src-$(QT_VERSION) qt-$(QT_VERSION)
-	$(APPLY) $(SRC)/qt/Win32-AOT.patch
 	$(MOVE)
 
 ifdef HAVE_MACOSX
@@ -35,7 +34,7 @@ QT_PLATFORM := -xplatform win32-g++ -device-option CROSS_COMPILE=$(HOST)-
 endif
 
 .qt: qt
-	cd $< && ./configure $(QT_PLATFORM) -static -release -no-sql-sqlite -no-gif -qt-libjpeg -no-openssl -no-opengl -opensource -confirm-license
+	cd $< && ./configure $(QT_PLATFORM) -static -release -no-sql-sqlite -no-gif -qt-libjpeg -no-openssl -no-opengl -opensource -confirm-license -no-dbus -pkg-config -no-qml-debug
 	cd $< && $(MAKE) sub-src
 	# INSTALLING LIBRARIES
 	for lib in Widgets Gui Core; \
@@ -43,7 +42,6 @@ endif
 	done
 	# INSTALLING PLUGINS
 	install -D -- $</plugins/platforms/libqwindows.a "$(PREFIX)/lib/libqwindows.a"
-	install -D -- $</plugins/accessible/libqtaccessiblewidgets.a "$(PREFIX)/lib/libqtaccessiblewidgets.a"
 	# INSTALLING HEADERS
 	for h in corelib gui widgets; \
 		do (cd $</src/$${h} && find . -type f -name '*.h' -exec install -D -- "{}" "$(PREFIX)/include/qt5/src/$${h}/{}" \;) ; \