lp://qastaging/~unity-team/qtmir/silo0
Created by
Gerry Boland
and last modified
- Get this branch:
- bzr branch lp://qastaging/~unity-team/qtmir/silo0
Members of
Unity Team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp://qastaging/qtmir
- Mir development team: Pending requested
-
Diff: 10000 lines (+6274/-1380) (has conflicts)103 files modified3rd_party/CMakeLists.txt (+1/-0)
3rd_party/xcursor/CMakeLists.txt (+15/-0)
3rd_party/xcursor/README (+1/-0)
3rd_party/xcursor/xcursor.c (+968/-0)
3rd_party/xcursor/xcursor.h (+65/-0)
CMakeLists.txt (+2/-1)
README (+10/-1)
debian/changelog (+12/-1)
debian/copyright (+21/-0)
demos/qml-demo-shell/ResizeArea.qml (+119/-0)
demos/qml-demo-shell/TitleBar.qml (+72/-0)
demos/qml-demo-shell/Window.qml (+166/-39)
demos/qml-demo-shell/WindowBufferSized.qml (+178/-0)
demos/qml-demo-shell/qml-demo-shell.qml (+172/-72)
src/common/debughelpers.cpp (+11/-0)
src/common/debughelpers.h (+1/-0)
src/modules/Unity/Application/CMakeLists.txt (+10/-2)
src/modules/Unity/Application/Cursor.qml (+12/-0)
src/modules/Unity/Application/cursorimageprovider.cpp (+146/-0)
src/modules/Unity/Application/cursorimageprovider.h (+68/-0)
src/modules/Unity/Application/mirbuffersgtexture.cpp (+5/-6)
src/modules/Unity/Application/mirbuffersgtexture.h (+2/-2)
src/modules/Unity/Application/mirsingleton.cpp (+33/-0)
src/modules/Unity/Application/mirsingleton.h (+45/-0)
src/modules/Unity/Application/mirsurface.cpp (+631/-0)
src/modules/Unity/Application/mirsurface.h (+152/-0)
src/modules/Unity/Application/mirsurfaceinterface.h (+90/-0)
src/modules/Unity/Application/mirsurfaceitem.cpp (+353/-421)
src/modules/Unity/Application/mirsurfaceitem.h (+61/-70)
src/modules/Unity/Application/mirsurfaceiteminterface.h (+0/-116)
src/modules/Unity/Application/mirsurfaceitemmodel.h (+0/-32)
src/modules/Unity/Application/mirsurfacemanager.cpp (+27/-29)
src/modules/Unity/Application/mirsurfacemanager.h (+13/-10)
src/modules/Unity/Application/mousepointer.cpp (+146/-0)
src/modules/Unity/Application/mousepointer.h (+70/-0)
src/modules/Unity/Application/plugin.cpp (+15/-4)
src/modules/Unity/Application/qmldir (+1/-0)
src/modules/Unity/Application/session.cpp (+7/-12)
src/modules/Unity/Application/session.h (+3/-3)
src/modules/Unity/Application/session_interface.h (+6/-6)
src/modules/Unity/CMakeLists.txt (+1/-0)
src/modules/Unity/Screens/CMakeLists.txt (+18/-0)
src/modules/Unity/Screens/plugin.cpp (+41/-0)
src/modules/Unity/Screens/qmldir (+2/-0)
src/modules/Unity/Screens/screens.cpp (+71/-0)
src/modules/Unity/Screens/screens.h (+54/-0)
src/platforms/mirserver/CMakeLists.txt (+7/-3)
src/platforms/mirserver/cursor.cpp (+121/-0)
src/platforms/mirserver/cursor.h (+56/-0)
src/platforms/mirserver/display.cpp.THIS (+1/-1)
src/platforms/mirserver/logging.h (+1/-0)
src/platforms/mirserver/miropenglcontext.cpp (+23/-8)
src/platforms/mirserver/mirserver.cpp (+40/-4)
src/platforms/mirserver/mirserver.h (+8/-3)
src/platforms/mirserver/mirserverintegration.cpp (+47/-40)
src/platforms/mirserver/mirserverintegration.h (+4/-7)
src/platforms/mirserver/mousepointerinterface.h (+57/-0)
src/platforms/mirserver/offscreensurface.cpp (+61/-0)
src/platforms/mirserver/offscreensurface.h (+43/-0)
src/platforms/mirserver/qmirserver.cpp (+13/-1)
src/platforms/mirserver/qmirserver.h (+3/-0)
src/platforms/mirserver/qmirserver_p.h (+2/-0)
src/platforms/mirserver/qtcompositor.cpp (+9/-34)
src/platforms/mirserver/qtcompositor.h (+13/-5)
src/platforms/mirserver/qteventfeeder.cpp (+118/-87)
src/platforms/mirserver/qteventfeeder.h (+13/-9)
src/platforms/mirserver/screen.cpp (+104/-7)
src/platforms/mirserver/screen.h (+42/-6)
src/platforms/mirserver/screencontroller.cpp (+299/-0)
src/platforms/mirserver/screencontroller.h (+101/-0)
src/platforms/mirserver/screenwindow.cpp (+33/-79)
src/platforms/mirserver/screenwindow.h (+10/-24)
src/platforms/mirserver/sessionlistener.h (+3/-1)
src/platforms/mirserver/surfaceobserver.cpp (+6/-0)
src/platforms/mirserver/surfaceobserver.h (+3/-1)
src/platforms/mirserver/tileddisplayconfigurationpolicy.cpp (+44/-0)
src/platforms/mirserver/tileddisplayconfigurationpolicy.h (+35/-0)
tests/common/fake_displayconfigurationoutput.h (+73/-0)
tests/common/gmock_fixes.h (+124/-0)
tests/common/mock_display.h (+53/-0)
tests/common/mock_display_buffer.h (+43/-0)
tests/common/mock_display_configuration.h (+35/-0)
tests/common/mock_main_loop.h (+53/-0)
tests/mirserver/CMakeLists.txt (+1/-0)
tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h (+17/-10)
tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp (+29/-16)
tests/mirserver/Screen/CMakeLists.txt (+1/-0)
tests/mirserver/Screen/screen_test.cpp (+40/-24)
tests/mirserver/ScreenController/CMakeLists.txt (+28/-0)
tests/mirserver/ScreenController/screencontroller_test.cpp (+194/-0)
tests/mirserver/ScreenController/stub_display.h (+91/-0)
tests/mirserver/ScreenController/stub_screen.h (+31/-0)
tests/mirserver/ScreenController/testable_screencontroller.h (+38/-0)
tests/modules/ApplicationManager/CMakeLists.txt (+1/-1)
tests/modules/ApplicationManager/application_manager_test.cpp (+22/-22)
tests/modules/MirSurfaceItem/CMakeLists.txt (+2/-0)
tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp (+32/-65)
tests/modules/SessionManager/CMakeLists.txt (+1/-1)
tests/modules/SessionManager/session_test.cpp (+4/-4)
tests/modules/common/fake_mirsurface.h (+141/-38)
tests/modules/common/mock_mirsurfaceitem.h (+0/-49)
tests/modules/common/mock_session.h (+2/-2)
tests/modules/common/qtmir_test.h (+1/-1)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/qtmir