diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2012-11-30 13:52:00 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2012-12-03 09:50:54 +0100 |
| commit | c2651cb953c4dfcf1578a380e65d6a0ec20ca571 (patch) | |
| tree | e5be70e6caafaafc7c9e93d1162d6d298d5c4775 /src/plugins | |
| parent | 9a8b92cc314aa84652c6da00129bb35f4a05a561 (diff) | |
Cleanup QtWayland module
Now that both xkbcommon 0.2.0 and libWayland 1.0.0 have been
released, we should no longer be building against sha1's and
should be preparing for an eventual release so these build hints
have been removed.
A test has been added for libWayland 1.0.0 which is required to
build QtWayland.
README has been updated to reflect the current situation
src/3rdparty has been removed as it has not been used in some time.
patches folder and contents have been removed as they are no longer
needed.
extensions folder has been moved to the src folder
Change-Id: Iab79b5c164758a4bd0253c90f60b2a2d044e2785
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/brcm_egl/brcm_egl.pri b/src/plugins/platforms/wayland/gl_integration/brcm_egl/brcm_egl.pri index 12b10d230..81b9be0f1 100644 --- a/src/plugins/platforms/wayland/gl_integration/brcm_egl/brcm_egl.pri +++ b/src/plugins/platforms/wayland/gl_integration/brcm_egl/brcm_egl.pri @@ -8,4 +8,4 @@ HEADERS += $$PWD/qwaylandbrcmeglintegration.h \ $$PWD/qwaylandbrcmglcontext.h \ $$PWD/qwaylandbrcmeglwindow.h -WAYLANDSOURCES += $$PWD/../../../../../../extensions/brcm.xml +WAYLANDSOURCES += $$PWD/../../../../../extensions/brcm.xml diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri index b40dcf9ca..e5f74c454 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri @@ -1,6 +1,6 @@ INCLUDEPATH += $$PWD -WAYLANDSOURCES += $$PWD/../../../../../../extensions/xcomposite.xml +WAYLANDSOURCES += $$PWD/../../../../../extensions/xcomposite.xml HEADERS += \ $$PWD/qwaylandxcompositebuffer.h diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index f47f78cbc..4b5287536 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -71,11 +71,11 @@ config_xkbcommon { } WAYLANDSOURCES += \ - $$PWD/../../../../extensions/surface-extension.xml \ - $$PWD/../../../../extensions/sub-surface-extension.xml \ - $$PWD/../../../../extensions/output-extension.xml \ - $$PWD/../../../../extensions/touch-extension.xml \ - $$PWD/../../../../extensions/qtkey-extension.xml + $$PWD/../../../extensions/surface-extension.xml \ + $$PWD/../../../extensions/sub-surface-extension.xml \ + $$PWD/../../../extensions/output-extension.xml \ + $$PWD/../../../extensions/touch-extension.xml \ + $$PWD/../../../extensions/qtkey-extension.xml OTHER_FILES += wayland.json diff --git a/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri b/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri index ec1db1fb3..57905ad9a 100644 --- a/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri +++ b/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri @@ -2,7 +2,7 @@ DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT contains(DEFINES, QT_WAYLAND_WINDOWMANAGER_SUPPORT) { - WAYLANDSOURCES += $$PWD/../../../../../extensions/windowmanager.xml + WAYLANDSOURCES += $$PWD/../../../../extensions/windowmanager.xml HEADERS += \ $$PWD/qwaylandwindowmanagerintegration.h |