Make wayland actually a module
authorJørgen Lind <jorgen.lind@nokia.com>
Mon, 5 Dec 2011 16:09:02 +0000 (17:09 +0100)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>
Wed, 7 Dec 2011 08:58:35 +0000 (09:58 +0100)
commit4c89518228012ddc3602eab405e4b5fb8108fcdf
tree615d4fdc38999e408d52998c39760064d223b652
parent542eca71e074b5110df2aaf822449bf7d6ec2b91
Make wayland actually a module

Also fix so that QtCompositor can be built as shared object.

+ fix so that the default QT_WAYLAND_GL_CONFIG is wayland_egl

Change-Id: I02b72e99286584426bd37ab2d00bbc84af11efdc
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
87 files changed:
README
examples/examples.pro [new file with mode: 0644]
examples/qml-compositor/main.cpp
examples/qml-compositor/qml-compositor.pro
examples/qwidget-compositor-mdi/main.cpp
examples/qwidget-compositor-mdi/qt-compositor.pro [deleted file]
examples/qwidget-compositor/qwidget-compositor.pro
examples/qwindow-compositor/qwindow-compositor.pro
examples/qwindow-compositor/surfacerenderer.cpp
examples/qwindow-compositor/surfacerenderer.h
modules/qt_compositor.pri [new file with mode: 0644]
qtwayland.pro
src/compositor/compositor.pri [moved from src/qt-compositor/qt-compositor.pri with 86% similarity]
src/compositor/compositor.pro [new file with mode: 0644]
src/compositor/compositor_api/compositor_api.pri [moved from src/qt-compositor/compositor_api/compositor_api.pri with 52% similarity]
src/compositor/compositor_api/waylandcompositor.cpp [moved from src/qt-compositor/compositor_api/waylandcompositor.cpp with 100% similarity]
src/compositor/compositor_api/waylandcompositor.h [moved from src/qt-compositor/compositor_api/waylandcompositor.h with 98% similarity]
src/compositor/compositor_api/waylandsurface.cpp [moved from src/qt-compositor/compositor_api/waylandsurface.cpp with 100% similarity]
src/compositor/compositor_api/waylandsurface.h [moved from src/qt-compositor/compositor_api/waylandsurface.h with 98% similarity]
src/compositor/compositor_api/waylandsurfaceitem.cpp [moved from src/qt-compositor/compositor_api/waylandsurfaceitem.cpp with 98% similarity]
src/compositor/compositor_api/waylandsurfaceitem.h [moved from src/qt-compositor/compositor_api/waylandsurfaceitem.h with 97% similarity]
src/compositor/hardware_integration/dri2_xcb/README [moved from src/qt-compositor/hardware_integration/dri2_xcb/README with 100% similarity]
src/compositor/hardware_integration/dri2_xcb/dri2_xcb.pri [moved from src/qt-compositor/hardware_integration/dri2_xcb/dri2_xcb.pri with 100% similarity]
src/compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp [moved from src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp with 100% similarity]
src/compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h [moved from src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h with 100% similarity]
src/compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp [moved from src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp with 100% similarity]
src/compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h [moved from src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h with 100% similarity]
src/compositor/hardware_integration/graphicshardwareintegration.cpp [moved from src/qt-compositor/hardware_integration/graphicshardwareintegration.cpp with 100% similarity]
src/compositor/hardware_integration/graphicshardwareintegration.h [moved from src/qt-compositor/hardware_integration/graphicshardwareintegration.h with 100% similarity]
src/compositor/hardware_integration/hardware_integration.pri [moved from src/qt-compositor/hardware_integration/hardware_integration.pri with 92% similarity]
src/compositor/hardware_integration/wayland_egl/wayland_egl.pri [moved from src/qt-compositor/hardware_integration/wayland_egl/wayland_egl.pri with 100% similarity]
src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp [moved from src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp with 100% similarity]
src/compositor/hardware_integration/wayland_egl/waylandeglintegration.h [moved from src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.h with 100% similarity]
src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri [moved from src/qt-compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri with 100% similarity]
src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp [moved from src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp with 100% similarity]
src/compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h [moved from src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h with 100% similarity]
src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri [moved from src/qt-compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri with 100% similarity]
src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp [moved from src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp with 100% similarity]
src/compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h [moved from src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml [moved from src/qt-compositor/hardware_integration/xcomposite_share/protocol/wayland-xcomposite.xml with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h [moved from src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-client-protocol.h with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c [moved from src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-protocol.c with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h [moved from src/qt-compositor/hardware_integration/xcomposite_share/wayland-xcomposite-server-protocol.h with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri [moved from src/qt-compositor/hardware_integration/xcomposite_share/xcomposite_share.pri with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp [moved from src/qt-compositor/hardware_integration/xcomposite_share/xcompositebuffer.cpp with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/xcompositebuffer.h [moved from src/qt-compositor/hardware_integration/xcomposite_share/xcompositebuffer.h with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp [moved from src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.cpp with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/xcompositehandler.h [moved from src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h with 100% similarity]
src/compositor/hardware_integration/xcomposite_share/xlibinclude.h [moved from src/qt-compositor/hardware_integration/xcomposite_share/xlibinclude.h with 100% similarity]
src/compositor/util/util.pri [moved from src/qt-compositor/util/util.pri with 100% similarity]
src/compositor/util/waylandobject.h [moved from src/qt-compositor/util/waylandobject.h with 100% similarity]
src/compositor/wayland_wrapper/wayland_wrapper.pri [moved from src/qt-compositor/wayland_wrapper/wayland_wrapper.pri with 100% similarity]
src/compositor/wayland_wrapper/wlcompositor.cpp [moved from src/qt-compositor/wayland_wrapper/wlcompositor.cpp with 100% similarity]
src/compositor/wayland_wrapper/wlcompositor.h [moved from src/qt-compositor/wayland_wrapper/wlcompositor.h with 100% similarity]
src/compositor/wayland_wrapper/wldatadevice.cpp [moved from src/qt-compositor/wayland_wrapper/wldatadevice.cpp with 100% similarity]
src/compositor/wayland_wrapper/wldatadevice.h [moved from src/qt-compositor/wayland_wrapper/wldatadevice.h with 100% similarity]
src/compositor/wayland_wrapper/wldatadevicemanager.cpp [moved from src/qt-compositor/wayland_wrapper/wldatadevicemanager.cpp with 100% similarity]
src/compositor/wayland_wrapper/wldatadevicemanager.h [moved from src/qt-compositor/wayland_wrapper/wldatadevicemanager.h with 100% similarity]
src/compositor/wayland_wrapper/wldataoffer.cpp [moved from src/qt-compositor/wayland_wrapper/wldataoffer.cpp with 100% similarity]
src/compositor/wayland_wrapper/wldataoffer.h [moved from src/qt-compositor/wayland_wrapper/wldataoffer.h with 100% similarity]
src/compositor/wayland_wrapper/wldatasource.cpp [moved from src/qt-compositor/wayland_wrapper/wldatasource.cpp with 100% similarity]
src/compositor/wayland_wrapper/wldatasource.h [moved from src/qt-compositor/wayland_wrapper/wldatasource.h with 100% similarity]
src/compositor/wayland_wrapper/wldisplay.cpp [moved from src/qt-compositor/wayland_wrapper/wldisplay.cpp with 100% similarity]
src/compositor/wayland_wrapper/wldisplay.h [moved from src/qt-compositor/wayland_wrapper/wldisplay.h with 100% similarity]
src/compositor/wayland_wrapper/wlinputdevice.cpp [moved from src/qt-compositor/wayland_wrapper/wlinputdevice.cpp with 100% similarity]
src/compositor/wayland_wrapper/wlinputdevice.h [moved from src/qt-compositor/wayland_wrapper/wlinputdevice.h with 100% similarity]
src/compositor/wayland_wrapper/wloutput.cpp [moved from src/qt-compositor/wayland_wrapper/wloutput.cpp with 100% similarity]
src/compositor/wayland_wrapper/wloutput.h [moved from src/qt-compositor/wayland_wrapper/wloutput.h with 100% similarity]
src/compositor/wayland_wrapper/wlshell.cpp [moved from src/qt-compositor/wayland_wrapper/wlshell.cpp with 100% similarity]
src/compositor/wayland_wrapper/wlshell.h [moved from src/qt-compositor/wayland_wrapper/wlshell.h with 100% similarity]
src/compositor/wayland_wrapper/wlshmbuffer.cpp [moved from src/qt-compositor/wayland_wrapper/wlshmbuffer.cpp with 100% similarity]
src/compositor/wayland_wrapper/wlshmbuffer.h [moved from src/qt-compositor/wayland_wrapper/wlshmbuffer.h with 100% similarity]
src/compositor/wayland_wrapper/wlsurface.cpp [moved from src/qt-compositor/wayland_wrapper/wlsurface.cpp with 100% similarity]
src/compositor/wayland_wrapper/wlsurface.h [moved from src/qt-compositor/wayland_wrapper/wlsurface.h with 100% similarity]
src/compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c [moved from src/qt-compositor/windowmanagerprotocol/wayland-windowmanager-protocol.c with 100% similarity]
src/compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h [moved from src/qt-compositor/windowmanagerprotocol/wayland-windowmanager-server-protocol.h with 100% similarity]
src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp [moved from src/qt-compositor/windowmanagerprotocol/waylandwindowmanagerintegration.cpp with 100% similarity]
src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h [moved from src/qt-compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h with 100% similarity]
src/compositor/windowmanagerprotocol/windowmanager.xml [moved from src/qt-compositor/windowmanagerprotocol/windowmanager.xml with 100% similarity]
src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri [moved from src/qt-compositor/windowmanagerprotocol/windowmanagerprotocol.pri with 100% similarity]
src/plugins/platforms/platforms.pro [new file with mode: 0644]
src/plugins/platforms/wayland/gl_integration/gl_integration.pri
src/plugins/platforms/wayland/wayland.pro
src/plugins/plugins.pro [new file with mode: 0644]
src/qt-compositor/qt-compositor.pro [deleted file]
src/src.pro
sync.profile [new file with mode: 0644]