lp:~ci-train-bot/qtmir/qtmir-ubuntu-xenial-landing-064
- Get this branch:
- bzr branch lp:~ci-train-bot/qtmir/qtmir-ubuntu-xenial-landing-064
Branch merges
- Mir development team: Pending requested
-
Diff: 4345 lines (+3483/-201)42 files modifieddebian/changelog (+30/-0)
debian/tests/control (+0/-5)
debian/tests/run-tests (+0/-10)
src/modules/Unity/Application/mirsurface.cpp (+5/-0)
src/modules/Unity/Application/mirsurfacemanager.cpp (+15/-0)
src/modules/Unity/Application/mirsurfacemanager.h (+5/-1)
src/platforms/mirserver/CMakeLists.txt (+2/-0)
src/platforms/mirserver/argvHelper.h (+52/-0)
src/platforms/mirserver/miropenglcontext.cpp (+7/-2)
src/platforms/mirserver/miropenglcontext.h (+2/-0)
src/platforms/mirserver/mirserver.cpp (+24/-11)
src/platforms/mirserver/mirserver.h (+1/-1)
src/platforms/mirserver/mirserverintegration.cpp (+2/-2)
src/platforms/mirserver/mirserverintegration.h (+1/-1)
src/platforms/mirserver/plugin.cpp (+4/-8)
src/platforms/mirserver/plugin.h (+1/-2)
src/platforms/mirserver/qmirserver.cpp (+2/-11)
src/platforms/mirserver/qmirserver.h (+1/-1)
src/platforms/mirserver/screen.cpp (+24/-4)
src/platforms/mirserver/screen.h (+3/-1)
src/platforms/mirserver/screenwindow.cpp (+1/-1)
src/platforms/mirserver/wm-wip/CMakeLists.txt (+22/-0)
src/platforms/mirserver/wm-wip/README (+5/-0)
src/platforms/mirserver/wm-wip/server_example_basic_window_manager.cpp (+312/-0)
src/platforms/mirserver/wm-wip/server_example_basic_window_manager.h (+252/-0)
src/platforms/mirserver/wm-wip/server_example_canonical_window_manager.cpp (+946/-0)
src/platforms/mirserver/wm-wip/server_example_canonical_window_manager.h (+132/-0)
src/platforms/mirserver/wm-wip/server_example_tiling_window_manager.cpp (+640/-0)
src/platforms/mirserver/wm-wip/server_example_tiling_window_manager.h (+124/-0)
src/platforms/mirserver/wm-wip/server_example_window_management.cpp (+155/-0)
src/platforms/mirserver/wm-wip/server_example_window_management.h (+33/-0)
src/platforms/mirserver/wm-wip/server_example_window_management_info.cpp (+406/-0)
src/platforms/mirserver/wm-wip/server_example_window_management_info.h (+103/-0)
tests/framework/mock_proc_info.cpp (+2/-0)
tests/framework/mock_session.cpp (+1/-0)
tests/framework/mock_task_controller.cpp (+4/-4)
tests/framework/qtmir_test.cpp (+2/-2)
tests/mirserver/ArgvHelper/CMakeLists.txt (+18/-0)
tests/mirserver/ArgvHelper/argvHelper_test.cpp (+72/-0)
tests/mirserver/CMakeLists.txt (+1/-0)
tests/mirserver/Screen/screen_test.cpp (+17/-3)
tests/modules/ApplicationManager/application_manager_test.cpp (+54/-131)
Related bugs
Bug #1524488: Manually setting the time into the past makes flickables misbehave | Undecided | Invalid | |
Bug #1532974: large window flicker on ubuntu apps launching in window mode | Critical | Fix Released |
Related blueprints
Branch information
Recent revisions
- 461. By MichaĆ Sawicz
-
Drop dummy autopkgtest
It doesn't make sense after all - DEP-8 tests are meant to test packages as-installed, not rebuild them from scratch. This meant that new Mir releases got blocked on this, because old qtmir was trying to build against new Mir, which usually fails, as needs adaptation for API changes.
Approved by: Gerry Boland - 460. By Alberto Aguirre
-
Hook MirOpenGLContex
t::doneCurrent to Screen::doneCurrent Actually unbind the opengl/egl context when requested.
Approved by: Gerry Boland - 459. By Michael Terry
-
Fix some mocks to use more realistic code paths.
Specifically, MockApplication
Controller: :doAppIdHasProc essId() was returning -1 if the appId was unknown. But that function returns a bool, so the -1 got translated into a true value. So that mocked method returned true for appIds that hadn't been registered yet. In order to fix that, I decided to rewrite doAppIdHasProcessId to call primaryPidForAppId so that it could be overridden easier in tests. And adjusted the affected tests to all set an ON_CALL(
primaryPidForAp pId). (Because otherwise the test has no way to influence the pid used for children -- why do we actually fork off a while(true) process?)
There are several other fixes here for pieces of the mocks that I found were missing while exploring solutions for the above problem:
- I'm actually not 100% clear on why this started being called, but MockSession::name() couldn't create a default value for QString and the gtest framework was bailing when it was called. So I added a default.
- Similarly, if ApplicationMana
ger::authorizeS ession( ) tries to examine an app's commandline, gtest will abort because MockProcInfo: :command_ line() doesn't have a mock return value. So I added a default. - And if authorizeSession() lasted long enough to see that the Application object already existed, it deleted the desktop reader object it had made. But the test mocks always returned the same object, so this caused a segfault. I retooled the ApplicationManager tests to return a new object each time DesktopFileRead
erFactory: :createInstance was called.
Approved by: Gerry Boland, Unity8 CI Bot - 458. By Gerry Boland
-
Ensure ScreenWindow geometry correctly set and used after moving Screen
NB: this will conflict with lp:~unity-team/qtmir/set-display-config, from which this is a cherry-pick Fixes: #1545286
Approved by: Gerry Boland, Unity8 CI Bot - 457. By Daniel d'Andrada
-
Ensure QmlEngine doesn't delete our MirSurfaces
Approved by: Gerry Boland, Unity8 CI Bot - 456. By Gerry Boland
-
Screen: only enable orientation sensor for internal display.
It's not great, but works around orientation sensor not working after device unplug from monitor. I believe this is because QtUbuntu-Sensors and Platform-api are not dealing properly with multiple accessors of the sensors. Instead only the last accessor gets correct state, and the earlier ones get nothing. Fixes: #1545286
Approved by: Unity8 CI Bot, Michael Zanetti - 455. By Michael Zanetti
-
Add a dedicated property for the inputMethodSurface
When we're hot-plugging screens, the OSK ui might only be created after surfaceCreated() is emitted and we miss that signal. Fixes: #1545286
Approved by: Daniel d'Andrada - 454. By Alan Griffiths
-
Copy the Window Management work-in-progress from Mir examples.
Approved by: Gerry Boland - 453. By Gerry Boland
-
Allow Mir remove command line arguments it understands, before letting Qt process them.
Approved by: Daniel d'Andrada
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:qtmir