Update Qt5 to 5.11.2

PR:		231560
Exp-run by:	antoine

3 files changed, 6 insertions, 30 deletions

diff --git a/graphics/qt5-3d/pkg-plist b/graphics/qt5-3d/pkg-plist
index b59ef25741b7..b2579256b127 100644
--- a/graphics/qt5-3d/pkg-plist
+++ b/graphics/qt5-3d/pkg-plist
@@ -926,6 +926,7 @@
 %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesextractor_p.h
 %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesvisitor_p.h
 %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/uniform_p.h
+%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateentitylayersjob_p.h
 %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatelevelofdetailjob_p.h
 %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatemeshtrianglelistjob_p.h
 %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateshaderdatatransformjob_p.h
diff --git a/graphics/qt5-pixeltool/files/patch-src__src.pro b/graphics/qt5-pixeltool/files/patch-src__src.pro
index f2ee76b26695..36126240eb12 100644
--- a/graphics/qt5-pixeltool/files/patch-src__src.pro
+++ b/graphics/qt5-pixeltool/files/patch-src__src.pro
@@ -1,9 +1,9 @@
 Only enter the directories we want to build, otherwise we might fail due to
 missing dependencies.
 
---- src/src.pro.orig	2018-06-09 11:10:38 UTC
+--- src/src.pro.orig	2018-09-21 17:44:37 UTC
 +++ src/src.pro
-@@ -1,53 +1,3 @@
+@@ -1,48 +1,3 @@
  TEMPLATE = subdirs
  
 -qtHaveModule(widgets) {
@@ -33,10 +33,6 @@ missing dependencies.
 -    SUBDIRS += macdeployqt
 -}
 -
--android {
--    SUBDIRS += androiddeployqt
--}
--
 -qtHaveModule(dbus): SUBDIRS += qdbus
 -
 -win32|winrt:SUBDIRS += windeployqt
@@ -51,7 +47,6 @@ missing dependencies.
 -# This is necessary to avoid a race condition between toolchain.prf
 -# invocations in a module-by-module cross-build.
 -cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
--    androiddeployqt.depends += qtattributionsscanner
 -    qdoc.depends += qtattributionsscanner
 -    windeployqt.depends += qtattributionsscanner
 -    winrtrunner.depends += qtattributionsscanner
diff --git a/graphics/qt5-wayland/pkg-plist b/graphics/qt5-wayland/pkg-plist
index 723a7e10b32f..8cf0073673b4 100644
--- a/graphics/qt5-wayland/pkg-plist
+++ b/graphics/qt5-wayland/pkg-plist
@@ -1,15 +1,5 @@
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclient-config_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclientglobal_p.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-hardware-integration.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qtkey-extension.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-shell-unstable-v6.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-shell.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandabstractdecoration_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandbuffer_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandclientbufferintegration_p.h
@@ -59,16 +49,6 @@
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshellv6_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshellv6integration_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgsurface_p.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qtkey-extension-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-shell-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-shell-unstable-v6-client-protocol.h
 %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtension
 %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtensionTemplate
 %%QT_INCDIR%%/QtWaylandClient/QtWaylandClient
@@ -103,8 +83,8 @@
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandoutput_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandoutputmode_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandpointer_p.h
-%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandquickhardwarelayer_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandqtwindowmanager_p.h
+%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandquickhardwarelayer_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandquickitem_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandquickshellsurfaceitem_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandseat_p.h
@@ -294,10 +274,10 @@
 %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug
 %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so
 %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so.debug
+%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so
+%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so.debug
 %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so
 %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so.debug
-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-egl.so
-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-egl.so.debug
 %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so
 %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so.debug
 %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so