diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:19:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:33:45 +0200 |
| commit | d7b198605de9979b7875c2da20dea5e4657deb17 (patch) | |
| tree | 7374f5b42572027f09c54e08b32ee3aac0bed4b8 /src/plugins/hardwareintegration | |
| parent | e4a4a6dd7503f069efbae81c0587f6d8fe3cee99 (diff) | |
| parent | d5e7965a87d81e2d7157c785403b0aba681de62a (diff) | |
| download | qtwayland-d7b198605de9979b7875c2da20dea5e4657deb17.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/client/qwaylandshmbackingstore.cpp
src/client/qwaylandwindow.cpp
Change-Id: I795fd08f0fc5d3cb5ed55bf16e724f66b7567723
Diffstat (limited to 'src/plugins/hardwareintegration')
4 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro index 39dcf570..6dbe5373 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro @@ -5,8 +5,6 @@ QT += waylandclient-private include(../../../../hardwareintegration/client/brcm-egl/brcm-egl.pri) -LIBS += -lEGL - OTHER_FILES += \ brcm-egl.json 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 3c069b7d..827228d2 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 @@ -8,8 +8,6 @@ QT += waylandclient-private include(../../../../hardwareintegration/client/drm-egl-server/drm-egl-server.pri) -LIBS += -lEGL - OTHER_FILES += \ drm-egl-server.json 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 6af6d5c1..55f98415 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 @@ -5,8 +5,6 @@ QT += waylandclient-private include(../../../../hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pri) -LIBS += -lEGL - OTHER_FILES += \ libhybris-egl-server.json diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro index 1608004f..f47898a4 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro @@ -5,8 +5,6 @@ QT = compositor compositor-private core-private gui-private OTHER_FILES += brcm-egl.json -LIBS += -lEGL - SOURCES += \ main.cpp |