From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Thu, 23 Feb 2017 01:30:50 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/ivi/20170223.120322^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee2bda654dc388af7a662cfc2fe4bc971ae2d38a;p=platform%2Fcore%2Fuifw%2Fisf.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I9699683ae14dbe740dc7f289408ae33741bce71c
---

ee2bda654dc388af7a662cfc2fe4bc971ae2d38a
diff --cc packaging/isf.spec
index e4afc2d,94ce2f6..09172ac
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@@ -118,14 -78,10 +118,14 @@@ Keyboard mode changer applicatio
  export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
  export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
  export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 +%if %{with wayland}
 +export CFLAGS="$CFLAGS -DWAYLAND"
 +export CXXFLAGS="$CXXFLAGS -DWAYLAND"
 +%endif
  
  %if "%{profile}" == "wearable"
- CFLAGS+=" -D_WEARABLE";
- CXXFLAGS+=" -D_WEARABLE";
+ CFLAGS+=" -D_WEARABLE -DENABLE_HIDE_PANEL_KEY=1";
+ CXXFLAGS+=" -D_WEARABLE -DENABLE_HIDE_PANEL_KEY=1";
  %endif
  
  %if "%{profile}" == "mobile" || "%{profile}" == "common"