Merge "(Builder) Set property without checking property type" into devel/master

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
index 3f7318a..f2e3cd7 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
@@ -198,10 +198,6 @@ bool TestApplication::GetRenderNeedsUpdate()
 {
   return mRenderStatus.NeedsUpdate();
 }
-bool TestApplication::GetRenderHasRendered()
-{
-  return mRenderStatus.HasRendered();
-}
 
 bool TestApplication::RenderOnly( )
 {

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
index 1f1161a..d6dab48 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
@@ -79,7 +79,6 @@ public:
   bool RenderOnly( );
   void ResetContext();
   bool GetRenderNeedsUpdate();
-  bool GetRenderHasRendered();
 
 private:
   void DoUpdate( unsigned int intervalMilliseconds, const char* location=NULL );