From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 25 Nov 2016 13:51:38 +0000 (-0800)
Subject: Merge "Revert public API changes. BATCH property." into devel/master
X-Git-Tag: dali_1.2.17~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9451f0b70a22bf739329225cb9db2068a4bbf608;hp=eecf6c78d76eda69386429e202e23b00ab608ae5;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge "Revert public API changes. BATCH property." into devel/master
---

diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp
index 3957954..4cc62ee 100644
--- a/examples/homescreen-benchmark/homescreen-benchmark.cpp
+++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp
@@ -17,6 +17,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali/devel-api/actors/actor-devel.h>
 #include <sstream>
 #include <iostream>
 
@@ -372,7 +373,7 @@ public:
 
       if( mConfig.mTableViewEnabled && mConfig.mBatchingEnabled )
       {
-        page.SetProperty( Actor::Property::BATCH_PARENT, true );
+        page.SetProperty( DevelActor::Property::BATCH_PARENT, true );
       }
     }