Commit 9451f0b70a22bf739329225cb9db2068a4bbf608

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents eecf6c78 9c07eea9

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

examples/homescreen-benchmark/homescreen-benchmark.cpp
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
  20 +#include <dali/devel-api/actors/actor-devel.h>
20 #include <sstream> 21 #include <sstream>
21 #include <iostream> 22 #include <iostream>
22 23
@@ -372,7 +373,7 @@ public: @@ -372,7 +373,7 @@ public:
372 373
373 if( mConfig.mTableViewEnabled && mConfig.mBatchingEnabled ) 374 if( mConfig.mTableViewEnabled && mConfig.mBatchingEnabled )
374 { 375 {
375 - page.SetProperty( Actor::Property::BATCH_PARENT, true ); 376 + page.SetProperty( DevelActor::Property::BATCH_PARENT, true );
376 } 377 }
377 } 378 }
378 379