diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 10:15:35 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 10:15:35 +0100 |
| commit | b77269ff500e184237d523496e17639c94009ac8 (patch) | |
| tree | 43e51355eaa03f0185ef82826fa0436821674426 /src/plugins/hardwareintegration/client | |
| parent | 12058b161e5f0d6f76523dc831acc8bdbc027fec (diff) | |
| parent | bacb3cdd83fd5c3112c5120130881ac3faa421fe (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ia76896a4d06240ccc3d95ba478b6ce273c7a0be2
Diffstat (limited to 'src/plugins/hardwareintegration/client')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/dmabuf-server.pro b/src/plugins/hardwareintegration/client/dmabuf-server/dmabuf-server.pro index 5925c8b04..3c91b2ecf 100644 --- a/src/plugins/hardwareintegration/client/dmabuf-server/dmabuf-server.pro +++ b/src/plugins/hardwareintegration/client/dmabuf-server/dmabuf-server.pro @@ -1,7 +1,7 @@ # We have a bunch of C code with casts, so we can't have this option QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual -QT += waylandclient-private +QT += waylandclient-private opengl include(../../../../hardwareintegration/client/dmabuf-server/dmabuf-server.pri) 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 2fba5bd1f..390278b1c 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,7 +1,7 @@ # We have a bunch of C code with casts, so we can't have this option QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual -QT += waylandclient-private +QT += waylandclient-private opengl include(../../../../hardwareintegration/client/drm-egl-server/drm-egl-server.pri) diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/shm-emulation-server.pro b/src/plugins/hardwareintegration/client/shm-emulation-server/shm-emulation-server.pro index 8b1c6e5f2..9e9319d25 100644 --- a/src/plugins/hardwareintegration/client/shm-emulation-server/shm-emulation-server.pro +++ b/src/plugins/hardwareintegration/client/shm-emulation-server/shm-emulation-server.pro @@ -1,7 +1,7 @@ # We have a bunch of C code with casts, so we can't have this option QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual -QT += waylandclient-private +QT += waylandclient-private opengl include(../../../../hardwareintegration/client/shm-emulation-server/shm-emulation-server.pri) diff --git a/src/plugins/hardwareintegration/client/vulkan-server/vulkan-server.pro b/src/plugins/hardwareintegration/client/vulkan-server/vulkan-server.pro index 1be60f7c1..13cb2ab90 100644 --- a/src/plugins/hardwareintegration/client/vulkan-server/vulkan-server.pro +++ b/src/plugins/hardwareintegration/client/vulkan-server/vulkan-server.pro @@ -1,7 +1,7 @@ # We have a bunch of C code with casts, so we can't have this option QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual -QT += waylandclient-private +QT += waylandclient-private opengl include(../../../../hardwareintegration/client/vulkan-server/vulkan-server.pri) |