Merge branch 'devel/master' into devel/graphics

Change-Id: I1c4d2148118bf84173c014185deb423f0df2916e

diff --combined automated-tests/src/dali-toolkit/CMakeLists.txt
index ee1ff65,47fb5a5..7649466
--- 1/automated-tests/src/dali-toolkit/CMakeLists.txt
--- 2/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -45,6 -45,7 +45,7 @@@ SET(TC_SOURCE
    utc-Dali-Tooltip.cpp
    utc-Dali-TransitionData.cpp
    utc-Dali-Button.cpp
+   utc-Dali-CameraView.cpp
    utc-Dali-Control.cpp
    utc-Dali-ControlImpl.cpp
    utc-Dali-ItemLayout.cpp
@@@ -110,15 -111,6 +111,15 @@@ SET(TEST_HARNESS_SOURCE
    dali-toolkit-test-utils/test-gesture-generator.cpp
    dali-toolkit-test-utils/test-gl-abstraction.cpp
    dali-toolkit-test-utils/test-gl-sync-abstraction.cpp
 +  dali-toolkit-test-utils/test-graphics-buffer.cpp
 +  dali-toolkit-test-utils/test-graphics-command-buffer.cpp
 +  dali-toolkit-test-utils/test-graphics-controller.cpp
 +  dali-toolkit-test-utils/test-graphics-texture.cpp
 +  dali-toolkit-test-utils/test-graphics-pipeline.cpp
 +  dali-toolkit-test-utils/test-graphics-program.cpp
 +  dali-toolkit-test-utils/test-graphics-reflection.cpp
 +  dali-toolkit-test-utils/test-graphics-sampler.cpp
 +  dali-toolkit-test-utils/test-graphics-shader.cpp
    dali-toolkit-test-utils/test-platform-abstraction.cpp
    dali-toolkit-test-utils/test-render-controller.cpp
    dali-toolkit-test-utils/test-trace-call-stack.cpp