Merge remote-tracking branch 'qt/5.6' into wip-compositor-api

Change-Id: Ie70fdd03e1259a8cb75bbdbf1324e3e4a2b51807

7 files changed, 15 insertions, 16 deletions

diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
index eb8e450f9..c4ccdcc6e 100644
--- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
+++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
@@ -7,12 +7,7 @@ contains(QT_CONFIG, no-pkg-config) {
     LIBS += -lwayland-client
 }
 
-for(p, QMAKE_LIBDIR_EGL) {
-    exists($$p):LIBS += -L$$p
-}
-
-LIBS += $$QMAKE_LIBS_EGL
-INCLUDEPATH += $$QMAKE_INCDIR_EGL
+CONFIG += egl
 
 SOURCES += $$PWD/qwaylandbrcmeglintegration.cpp \
            $$PWD/qwaylandbrcmglcontext.cpp \
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
index c9ebb96b4..ca4b653af 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
@@ -90,13 +90,13 @@ void QWaylandBrcmEglIntegration::initialize(QWaylandDisplay *waylandDisplay)
             qWarning("failed to resolve eglFlushBRCM, performance will suffer");
         }
 
-        eglCreateGlobalImageBRCM = ::eglCreateGlobalImageBRCM;
+        eglCreateGlobalImageBRCM = (PFNEGLCREATEGLOBALIMAGEBRCMPROC)eglGetProcAddress("eglCreateGlobalImageBRCM");
         if (!eglCreateGlobalImageBRCM) {
             qWarning("failed to resolve eglCreateGlobalImageBRCM");
             return;
         }
 
-        eglDestroyGlobalImageBRCM = ::eglDestroyGlobalImageBRCM;
+        eglDestroyGlobalImageBRCM = (PFNEGLDESTROYGLOBALIMAGEBRCMPROC)eglGetProcAddress("eglDestroyGlobalImageBRCM");
         if (!eglDestroyGlobalImageBRCM) {
             qWarning("failed to resolve eglDestroyGlobalImageBRCM");
             return;
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
index 7fe557fbb..cc5940f4e 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
@@ -40,7 +40,6 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-#define EGL_EGLEXT_PROTOTYPES
 #include <EGL/eglext_brcm.h>
 
 #include <QtCore/qglobal.h>
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
index 7cead1dc7..54e95317b 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
@@ -42,7 +42,6 @@
 #include <QtGui/QWindow>
 #include <qpa/qwindowsysteminterface.h>
 
-#define EGL_EGLEXT_PROTOTYPES
 #include <EGL/eglext_brcm.h>
 
 #include <wayland-client.h>
diff --git a/src/hardwareintegration/client/drm-egl-server/drm-egl-server.pri b/src/hardwareintegration/client/drm-egl-server/drm-egl-server.pri
index dbc8dacf9..c3d592a98 100644
--- a/src/hardwareintegration/client/drm-egl-server/drm-egl-server.pri
+++ b/src/hardwareintegration/client/drm-egl-server/drm-egl-server.pri
@@ -1,12 +1,14 @@
 INCLUDEPATH += $$PWD
 
 contains(QT_CONFIG, no-pkg-config) {
-    LIBS += -lEGL -lwayland-client
+    LIBS += -lwayland-client
 } else {
     CONFIG += link_pkgconfig
-    PKGCONFIG += egl wayland-client
+    PKGCONFIG += wayland-client
 }
 
+CONFIG += egl
+
 SOURCES += \
         $$PWD/drmeglserverbufferintegration.cpp
 
diff --git a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
index 107a96f93..951d28c52 100644
--- a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
+++ b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
@@ -1,11 +1,13 @@
 INCLUDEPATH += $$PWD
 !contains(QT_CONFIG, no-pkg-config) {
     CONFIG += link_pkgconfig
-    PKGCONFIG += wayland-client wayland-egl egl
+    PKGCONFIG += wayland-client wayland-egl
 } else {
-    LIBS += -lwayland-egl -lEGL
+    LIBS += -lwayland-egl
 }
 
+CONFIG += egl
+
 SOURCES += $$PWD/qwaylandeglclientbufferintegration.cpp \
            $$PWD/qwaylandglcontext.cpp \
            $$PWD/qwaylandeglwindow.cpp
diff --git a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
index 89ec9840d..4435f481b 100644
--- a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
+++ b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
@@ -3,11 +3,13 @@ include($$PWD/../xcomposite_share/xcomposite_share.pri)
 
 !contains(QT_CONFIG, no-pkg-config) {
     CONFIG += link_pkgconfig
-    PKGCONFIG += wayland-client xcomposite egl x11
+    PKGCONFIG += wayland-client xcomposite x11
 } else {
-    LIBS += -lXcomposite -lEGL -lX11
+    LIBS += -lXcomposite -lX11
 }
 
+CONFIG += egl
+
 SOURCES += \
     $$PWD/qwaylandxcompositeeglcontext.cpp \
     $$PWD/qwaylandxcompositeeglclientbufferintegration.cpp \