lp:~gerboland/qtmir/use-mir-test-dev

Branch merges

Merged into lp:qtmir at revision 562

Alan Griffiths: Approve on 2016-08-25

Unity8 CI Bot: Approve (continuous-integration) on 2016-08-23

Diff: 455 lines (+38/-237)

12 files modified

debian/control (+2/-1)
tests/CMakeLists.txt (+2/-0)
tests/framework/CMakeLists.txt (+1/-3)
tests/framework/mock_display.cpp (+0/-35)
tests/framework/mock_display.h (+0/-66)
tests/framework/mock_display_configuration.cpp (+0/-25)
tests/framework/mock_display_configuration.h (+0/-40)
tests/framework/mock_gl_display_buffer.cpp (+0/-30)
tests/framework/mock_gl_display_buffer.h (+4/-12)
tests/mirserver/ScreensModel/CMakeLists.txt (+1/-0)
tests/mirserver/ScreensModel/screensmodel_test.cpp (+9/-0)
tests/mirserver/ScreensModel/stub_display.h (+19/-25)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

542. By Gerry Boland on 2016-09-07

Merge qtmir trunk

541. By Gerry Boland on 2016-08-22

Fix FTBFS: include pkg before adding subdirectories which require the pkg

540. By Gerry Boland on 2016-08-22

Debian control typo fix

539. By Gerry Boland on 2016-08-19

Restore the empty vector - it has nontrivial meaning, good to keep it and the comment around

538. By Gerry Boland on 2016-08-19

Merge trunk

537. By Gerry Boland on 2016-08-19

Silence logging output

536. By Gerry Boland on 2016-08-19

Remove MockDisplay and friends, use mirtest instead

535. By Gerry Boland on 2016-08-19

Avoid default argument, be explicit. Copyright bumps

534. By Gerry Boland on 2016-08-19

Can simplify MockGLDisplayBuffer greatly using mirtest

533. By Gerry Boland on 2016-08-19

Replace our copy of MockDisplayConfiguration with one from mirtest-dev.