Removed desktop build warning & Ecore IMF version print out

Change-Id: Ic53ab3608dbda466c925456fc183d3929f310f91

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 99b79aa..752b04c 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -305,7 +305,6 @@ MESSAGE( STATUS "Data Dir (Read/Write):            ${dataReadWriteDir}")
 MESSAGE( STATUS "Data Dir (Read Only):             ${dataReadOnlyDir}")
 MESSAGE( STATUS "EldBus:                           ${eldbus_available_ENABLED}")
 MESSAGE( STATUS "Shader Binary Cache:              ${ENABLE_SHADERBINCACHE}")
-MESSAGE( STATUS "Ecore Version At Least 1.13.0     ${ecore_imf_1_13_ENABLED}")
 MESSAGE( STATUS "Network logging enabled:          ${ENABLE_NETWORKLOGGING}")
 MESSAGE( STATUS "Font config file:                 \"${fontConfigurationFile}\"")
 MESSAGE( STATUS "Using Tizen APP FW libraries:     ${ENABLE_APPFW}")

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index 228278e..d22ccd8 100644 (file)
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -66,7 +66,7 @@ CHECK_MODULE_AND_SET( EVAS evas [] )
 CHECK_MODULE_AND_SET( TTRACE ttrace ENABLE_TTRACE )
 CHECK_MODULE_AND_SET( ECORE ecore [] )
 CHECK_MODULE_AND_SET( ECORE_IPC ecore-ipc [] )
-CHECK_MODULE_AND_SET( ECORE_IMF ecore-imf>=1.13 ecore_imf_1_13 )
+CHECK_MODULE_AND_SET( ECORE_IMF ecore-imf [] )
 CHECK_MODULE_AND_SET( ELDBUS eldbus eldbus_available )
 CHECK_MODULE_AND_SET( TPKP_CURL tpkp-curl tpkp_curl_available )
 CHECK_MODULE_AND_SET( UTILX utilX utilx_available )

diff --git a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
index ca80d03..adfbd2f 100755 (executable)
--- a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/internal/input/linux/dali-ecore-imf.h>
 #include <dali/internal/input/ubuntu-x11/dali-ecore-input.h>
+#include <dali/internal/system/linux/dali-ecore.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/adaptor-framework/key.h>
 #include <dali/public-api/object/type-registry.h>
@@ -810,13 +811,13 @@ bool InputMethodContextX::ProcessEventKeyDown( const KeyEvent& keyEvent )
     ecoreKeyDownEvent.modifiers = EcoreInputModifierToEcoreIMFModifier( keyEvent.keyModifier );
     ecoreKeyDownEvent.locks = EcoreInputModifierToEcoreIMFLock( keyEvent.keyModifier );
 
-#ifdef defined(ECORE_VERSION_MAJOR) && (ECORE_VERSION_MAJOR >= 1) && defined(ECORE_VERSION_MINOR)
-#ifdef (ECORE_VERSION_MINOR >= 14)
+#if defined(ECORE_VERSION_MAJOR) && (ECORE_VERSION_MAJOR >= 1) && defined(ECORE_VERSION_MINOR)
+#if (ECORE_VERSION_MINOR >= 14)
     ecoreKeyDownEvent.dev_name  = "";
     ecoreKeyDownEvent.dev_class = ECORE_IMF_DEVICE_CLASS_KEYBOARD;
     ecoreKeyDownEvent.dev_subclass = ECORE_IMF_DEVICE_SUBCLASS_NONE;
 #endif // Since ecore_imf 1.14 version
-#ifdef (ECORE_VERSION_MINOR >= 22)
+#if (ECORE_VERSION_MINOR >= 22)
     ecoreKeyDownEvent.keycode = keyEvent.keyCode;
 #endif // Since ecore_imf 1.22 version
 #endif // Since ecore_imf Version 1
@@ -869,11 +870,11 @@ bool InputMethodContextX::ProcessEventKeyUp( const KeyEvent& keyEvent )
     ecoreKeyUpEvent.timestamp = keyEvent.time;
     ecoreKeyUpEvent.modifiers = EcoreInputModifierToEcoreIMFModifier( keyEvent.keyModifier );
     ecoreKeyUpEvent.locks = EcoreInputModifierToEcoreIMFLock( keyEvent.keyModifier );
-#ifdef defined(ECORE_VERSION_MAJOR) && (ECORE_VERSION_MAJOR >= 1) && defined(ECORE_VERSION_MINOR)
-#ifdef (ECORE_VERSION_MINOR >= 14)
+#if defined(ECORE_VERSION_MAJOR) && (ECORE_VERSION_MAJOR >= 1) && defined(ECORE_VERSION_MINOR)
+#if (ECORE_VERSION_MINOR >= 14)
     ecoreKeyUpEvent.dev_name  = "";
 #endif // Since ecore_imf 1.14 version
-#ifdef (ECORE_VERSION_MINOR >= 22)
+#if (ECORE_VERSION_MINOR >= 22)
     ecoreKeyUpEvent.keycode = keyEvent.keyCode;
 #endif // Since ecore_imf 1.22 version
 #endif // Since ecore_imf Version 1