Make building of platform plugins indifferent if its out of source

This requires some source files to be shipped with the Qt install
They are now copied into QT_INSTALL_DATA/platform

diff --git a/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri b/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri
index 0d8e01b..3325fe8 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri
+++ b/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri
@@ -1,14 +1,12 @@
-
 LIBS += -lX11 -lXext -lEGL
 
+load(qpa/egl/convenience)
 HEADERS += \
     $$PWD/qwaylandreadbackeglintegration.h \
     $$PWD/qwaylandreadbackeglcontext.h \
     $$PWD/qwaylandreadbackeglwindow.h \
-    $$PWD/../../../eglconvenience/qeglconvenience.h
 
 SOURCES += \
     $$PWD/qwaylandreadbackeglintegration.cpp \
     $$PWD/qwaylandreadbackeglwindow.cpp \
     $$PWD/qwaylandreadbackeglcontext.cpp \
-    $$PWD/../../../eglconvenience/qeglconvenience.cpp

diff --git a/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri b/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri
index f8ea005..dc84d1c 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri
+++ b/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri
@@ -1,4 +1,4 @@
-include (../../../glxconvenience/glxconvenience.pri)
+load(qpa/glx/convenience)
 HEADERS += \
     $$PWD/qwaylandreadbackglxintegration.h \
     $$PWD/qwaylandreadbackglxwindow.h \

diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri b/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri
index cd07011..6f4edb0 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri
@@ -1,4 +1,4 @@
-include (../../../eglconvenience/eglconvenience.pri)
+load(qpa/egl/convenience)
 
 LIBS += -lwayland-egl -lEGL
 INCLUDEPATH += $$PWD

diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri
index c3533f9..7d2f8ad 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri
@@ -1,6 +1,6 @@
 include (../xcomposite_share/xcomposite_share.pri)
-include (../../../eglconvenience/eglconvenience.pri)
-include (../../../eglconvenience/xlibeglintegration.pri)
+load(qpa/egl/convenience)
+load(qpa/egl/xlibintegration)
 
 LIBS += -lXcomposite -lEGL
 

diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri
index 43295e9..9aae32c 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri
@@ -1,5 +1,5 @@
 include (../xcomposite_share/xcomposite_share.pri)
-include (../../../glxconvenience/glxconvenience.pri)
+load(qpa/glx/convenience)
 
 LIBS += -lXcomposite
 SOURCES += \

diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 5bf751b..b37bfbb 100644 (file)
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -1,5 +1,5 @@
 TARGET = qwayland
-load(qt_plugin)
+load(qpa/plugin)
 
 QT+=gui-private core-private opengl-private
 
@@ -45,9 +45,10 @@ QT += core-private
 QT += widgets-private
 
 include ($$PWD/gl_integration/gl_integration.pri)
+
 include ($$PWD/windowmanager_integration/windowmanager_integration.pri)
 
-include (../fontdatabases/genericunix/genericunix.pri)
+load(qpa/fontdatabases/genericunix)
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target