1 files changed, 13 insertions, 2 deletions
diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp
index 7f404902fa..cbf6640552 100644
--- a/tizen/src/ui/menu/detailedinfodialog.cpp
+++ b/tizen/src/ui/menu/detailedinfodialog.cpp
@@ -34,6 +34,7 @@
 #include "resource/ui_strings.h"
 #include "mainwindow.h"
 #include "menu/advancedmenuitem.h"
+#include "emul_state.h"
 
 extern "C" {
 int get_display_pixel_density(void);
@@ -54,6 +55,9 @@ DetailedInfoDialog::DetailedInfoDialog(QWidget *parent) :
     win = ((MainWindow *)parent);
     keyboardShortcut = win->getKeyboardShortcut();
 
+    // remove ? button
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
     setWindowTitle(DETAILED_INFO_TITLE);
     setMinimumWidth(DIALOG_MIN_WIDTH);
     setMinimumHeight(DIALOG_MIN_HEIGHT);
@@ -73,8 +77,10 @@ DetailedInfoDialog::DetailedInfoDialog(QWidget *parent) :
         /* VM information table */
         vmInfoTable = createVmInfoTable();
         tabWidget->addTab(vmInfoTable, tr(DETAILED_INFO_VMTAB_TITLE));
-
+// FIXME: temporarily remove shortcut dialog in DARWIN
+#ifndef CONFIG_DARWIN
         /* shortcut information table */
+
         QTabWidget *shortcutTab = new QTabWidget(tabWidget);
 
         menuShortcutTable = createShortcutInfoTable();
@@ -83,6 +89,8 @@ DetailedInfoDialog::DetailedInfoDialog(QWidget *parent) :
         shortcutTab->addTab(keyShortcutTable, "HW Key");
 
         tabWidget->addTab(shortcutTab, DETAILED_INFO_SHORTCUTTAB_TITLE);
+#endif
+
     }
     upsideLayout->addWidget(tabWidget);
 
@@ -195,7 +203,7 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable()
     }
 
     QString pkgVer = QString(pkginfo_version).section(':', 1).trimmed();
-    insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_VER), QString(EMULATOR_BUILD_VER) +
+    insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_VER), QString(get_platform_version()).section('-', 1).trimmed() +
         " Release on " + sdkVer + " SDK (" + pkgVer + ")");
 
     /* add double click event listener */
@@ -319,7 +327,10 @@ void DetailedInfoDialog::insertHwKeyShortcutInfo(
 /* override */
 void DetailedInfoDialog::showEvent(QShowEvent *event)
 {
+// FIXME: temporarily remove shortcut dialog in DARWIN
+#ifndef CONFIG_DARWIN
     updateShortcutTableItems();
+#endif
 
     if ((windowState() & Qt::WindowMaximized) == 0) {
         tabWidget->setCurrentIndex(0);