Merge "(ScrollView) Stop the touch down timer if Transform is called (via ScrollTo...

diff --git a/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp b/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
index 9f3fe92..df420cf 100644 (file)
--- a/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
+++ b/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
@@ -18,12 +18,12 @@
 // FILE HEADER
 #include <dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h>
 
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/text-view/text-view-processor-types.h>
-
 // EXTERNAL INCLUDES
 #include <iostream>
 
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-types.h>
+
 namespace Dali
 {
 

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 225e80d..737f340 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -52,7 +52,7 @@ Application development package for the OpenGLES Canvas toolkit - headers and pa
 %build
 PREFIX="/usr"
 CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections "
-LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections "
+LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections -Wl,-Bsymbolic-functions "
 
 libtoolize --force
 cd %{_builddir}/dali-toolkit-%{version}/build/tizen