Merge "DALi Version 1.0.5" into tizen

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
index fcda1d2..1a6a0b3 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
@@ -26,7 +26,7 @@
 #define __DALI_ACCESSIBILITY_MANAGER_H__
 #define __DALI_TIMER_H__
 #define __DALI_CLIPBOARD_H__
-#define IMFMANAGER_H
+#define __DALI_IMF_MANAGER_H__
 
 #include <dali-test-suite-utils.h>
 

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
index ea1888d..186fadd 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
@@ -19,7 +19,7 @@
 #define __DALI_ACCESSIBILITY_MANAGER_H__
 #define __DALI_TIMER_H__
 #define __DALI_CLIPBOARD_H__
-#define IMFMANAGER_H
+#define __DALI_IMF_MANAGER_H__
 
 #include "toolkit-adaptor.h"
 #include <map>

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
index 5c61ea8..9554eaf 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
@@ -21,7 +21,7 @@
 
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
-#include <dali/public-api/orientation.h>
+#include <dali/public-api/adaptor-framework/orientation.h>
 
 namespace Dali
 {

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h
index 15d7b16..c7dcc08 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h
@@ -22,7 +22,7 @@
 #include <string>
 
 // PUBLIC INCLUDES
-#include <dali/public-api/clipboard-event-notifier.h>
+#include <dali/public-api/adaptor-framework/clipboard-event-notifier.h>
 
 namespace Dali
 {

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
index bd8cb62..2ac731f 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
@@ -1,5 +1,5 @@
-#ifndef _DALI_ADAPTOR_IMF_MANAGER_H_
-#define _DALI_ADAPTOR_IMF_MANAGER_H_
+#ifndef __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__
+#define __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__
 
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#define IMFMANAGER_H
+#define __DALI_IMF_MANAGER_H__
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
@@ -224,4 +224,4 @@ public:
 
 } // namespace Dali
 
-#endif // _DALI_ADAPTOR_IMF_MANAGER_H_
+#endif // __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.h
index 303f3a6..d62941b 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.h
@@ -20,9 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <string>
-
-// INTERNAL INCLUDES
-#include <dali/public-api/orientation.h>
+#include <dali/public-api/adaptor-framework/orientation.h>
 
 namespace Dali
 {

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
index 3876b2f..e815105 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
@@ -25,7 +25,7 @@
 #define __DALI_STYLE_MONITOR_H__
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
-#include <dali/public-api/style-change.h>
+#include <dali/public-api/adaptor-framework/style-change.h>
 
 namespace Dali
 {

diff --git a/build/tizen/dali-toolkit.pc.in b/build/tizen/dali-toolkit.pc.in
index 48827c3..87cbcc0 100644 (file)
--- a/build/tizen/dali-toolkit.pc.in
+++ b/build/tizen/dali-toolkit.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 apiversion=@DALI_TOOLKIT_VERSION@
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 includedir=@devincludepath@
 
 Name: Samsung OpenGLES Toolkit (including Toolkit)