Merge remote-tracking branch 'qt/5.6' into 5.7

Change-Id: Iada0e076ee33e8d39ecc4f40edfd9764ba610c03

12 files changed, 28 insertions, 36 deletions

diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro
index 6dbe53732..550343cfe 100644
--- a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro
+++ b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-client
-load(qt_plugin)
-
 QT += waylandclient-private
 
 include(../../../../hardwareintegration/client/brcm-egl/brcm-egl.pri)
@@ -10,3 +7,5 @@ OTHER_FILES += \
 
 SOURCES += main.cpp
 
+PLUGIN_TYPE = wayland-graphics-integration-client
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro
index 827228d2b..29a48c9e6 100644
--- a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro
+++ b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-client
-load(qt_plugin)
-
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
@@ -13,3 +10,5 @@ OTHER_FILES += \
 
 SOURCES += main.cpp
 
+PLUGIN_TYPE = wayland-graphics-integration-client
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro
index 55f98415d..d7bf03705 100644
--- a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro
+++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-client
-load(qt_plugin)
-
 QT += waylandclient-private
 
 include(../../../../hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pri)
@@ -10,3 +7,5 @@ OTHER_FILES += \
 
 SOURCES += main.cpp
 
+PLUGIN_TYPE = wayland-graphics-integration-client
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro
index 389896288..076b6af2c 100644
--- a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro
+++ b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-client
-load(qt_plugin)
-
 QT += waylandclient-private
 
 include(../../../../hardwareintegration/client/wayland-egl/wayland-egl.pri)
@@ -10,3 +7,5 @@ OTHER_FILES += \
 
 SOURCES += main.cpp
 
+PLUGIN_TYPE = wayland-graphics-integration-client
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro
index 1af178669..031d2812a 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-client
-load(qt_plugin)
-
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
@@ -13,3 +10,5 @@ OTHER_FILES += xcomposite-egl.json
 SOURCES += \
     main.cpp
 
+PLUGIN_TYPE = wayland-graphics-integration-client
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro
index 0080150cc..eb8e03c7f 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-client
-load(qt_plugin)
-
 QT += waylandclient-private
 
 include(../../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri)
@@ -10,3 +7,5 @@ OTHER_FILES += xcomposite-glx.json
 SOURCES += \
     main.cpp
 
+PLUGIN_TYPE = wayland-graphics-integration-client
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
index 74da1643b..e6e395721 100644
--- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
+++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-server
-load(qt_plugin)
-
 QT = waylandcompositor waylandcompositor-private core-private gui-private
 
 OTHER_FILES += brcm-egl.json
@@ -9,3 +6,6 @@ SOURCES += \
     main.cpp
 
 include(../../../../hardwareintegration/compositor/brcm-egl/brcm-egl.pri)
+
+PLUGIN_TYPE = wayland-graphics-integration-server
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro
index 806e1fac1..40092a140 100644
--- a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro
+++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-server
-load(qt_plugin)
-
 QT = waylandcompositor waylandcompositor-private core-private gui-private
 
 OTHER_FILES += drm-egl-server.json
@@ -10,3 +7,5 @@ SOURCES += \
 
 include($PWD/../../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri)
 
+PLUGIN_TYPE = wayland-graphics-integration-server
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro
index 7780df50d..e21bb3c53 100644
--- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro
+++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-server
-load(qt_plugin)
-
 QT = waylandcompositor waylandcompositor-private core-private gui-private
 
 OTHER_FILES += libhybris-egl-server.json
@@ -10,3 +7,5 @@ SOURCES += \
 
 include($PWD/../../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri)
 
+PLUGIN_TYPE = wayland-graphics-integration-server
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro
index 5704663b0..7374a5982 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-server
-load(qt_plugin)
-
 QT = waylandcompositor waylandcompositor-private core-private gui-private platformsupport-private
 
 OTHER_FILES += wayland-egl.json
@@ -9,3 +6,6 @@ SOURCES += \
     main.cpp
 
 include(../../../../hardwareintegration/compositor/wayland-egl/wayland-egl.pri)
+
+PLUGIN_TYPE = wayland-graphics-integration-server
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro
index 5475f2046..fab000e28 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-server
-load(qt_plugin)
-
 QT += waylandcompositor waylandcompositor-private core-private gui-private
 
 OTHER_FILES += xcomposite-egl.json
@@ -9,3 +6,6 @@ SOURCES += \
     main.cpp
 
 include(../../../../hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri)
+
+PLUGIN_TYPE = wayland-graphics-integration-server
+load(qt_plugin)
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro
index 3441f271e..9dee1431c 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro
@@ -1,6 +1,3 @@
-PLUGIN_TYPE = wayland-graphics-integration-server
-load(qt_plugin)
-
 QT += waylandcompositor waylandcompositor-private core-private gui-private
 
 OTHER_FILES += xcomposite-glx.json
@@ -9,3 +6,6 @@ SOURCES += \
     main.cpp
 
 include(../../../../hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri)
+
+PLUGIN_TYPE = wayland-graphics-integration-server
+load(qt_plugin)