From: Sangho Park <sangho1206.park@samsung.com>
Date: Tue, 5 Aug 2014 01:40:09 +0000 (-0700)
Subject: Merge "menu: create controller menu" into features/qt_dr
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b9ef61da068a2d7b39520703f2b4f837c5c7d7e;p=sdk%2Femulator%2Fqemu.git

Merge "menu: create controller menu" into features/qt_dr
---

0b9ef61da068a2d7b39520703f2b4f837c5c7d7e
diff --cc tizen/src/ui/menu/contextmenu.h
index eb38728fc3,2ed94e7340..11b51fefed
--- a/tizen/src/ui/menu/contextmenu.h
+++ b/tizen/src/ui/menu/contextmenu.h
@@@ -27,8 -26,8 +27,9 @@@ public slots
      void slotTopMost(bool check);
      void slotRotate(int angle);
      void slotScale(int scale);
+     void slotController(int index);
      void slotShell();
 +    void slotControlPanel();
      void slotAbout();
      void slotForceClose();
      void slotClose();