← Back to branch summary

~mterry/qtmir/report-osk-max-height

« back to all changes in this revision

Viewing changes to tests/mirserver/ScreensModel/CMakeLists.txt

  • Committer: CI Train Bot
  • Author(s): Gerry Boland, Michał Sawicz, Nick Dedekind
  • Date: 2016-04-29 20:04:51 UTC
  • mfrom: (434.5.64 set-display-config)
  • Revision ID: ci-train-bot@canonical.com-20160429200451-v0bjc4pcypynt83b
Enhance ScreenController & the DisplayConfigurationPolicy to implement dynamic grid units.

- Rename ScreenController to ScreenModel, as it just reflects current screen state, does not offer means to configure it
- ScreenController can update state of existing Screens, based on Mir DisplayConfiguration changes.
- Expand Screen to include scale & form factor properties, with getter/notifier in NativeInterface. This enables the dynamic grid units in the shell
- Add a Unity.Screens qml module to give QML better information about connected screens, and allow basic reconfiguring.
- Implement a basic display configuration policy to set suitable scale and form factor on an external display (needed for dynamic grid units) Fixes: #1573532
Approved by: Unity8 CI Bot, Daniel d'Andrada

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mirserver/ScreensModel/CMakeLists.txt
1
1
set(
2
2
  SCREENCONTROLLER_TEST_SOURCES
3
 
  screencontroller_test.cpp
 
3
  screensmodel_test.cpp
4
4
  ${CMAKE_SOURCE_DIR}/src/common/debughelpers.cpp
5
5
  # to be moc-ed
6
6
  stub_screen.h
7
 
  testable_screencontroller.h
 
7
  testable_screensmodel.h
8
8
)
9
9
 
10
10
include_directories(
16
16
  ${MIRRENDERERGLDEV_INCLUDE_DIRS}
17
17
)
18
18
 
19
 
add_executable(ScreenControllerTest ${SCREENCONTROLLER_TEST_SOURCES})
 
19
add_executable(ScreensModelTest ${SCREENCONTROLLER_TEST_SOURCES})
20
20
 
21
21
target_link_libraries(
22
 
  ScreenControllerTest
 
22
  ScreensModelTest
23
23
  qpa-mirserver
24
24
 
25
25
  -L${CMAKE_BINARY_DIR}/tests/framework
29
29
  ${GMOCK_LIBRARIES}
30
30
)
31
31
 
32
 
add_test(ScreenController, ScreenControllerTest)
 
32
add_test(ScreensModel, ScreensModelTest)