Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 60599)
@@ -160,4 +160,7 @@
  VirtualBox_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
  VBOX_GUI_WITH_NETWORK_MANAGER := 1
+endif
+ifneq ($(KBUILD_TYPE),release)
+ VirtualBox_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 endif
 ifdef VBOX_BLEEDING_EDGE
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 60599)
@@ -162,9 +162,9 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 /* VirtualBox: Extra-data Manager window: */
 const char* UIExtraDataDefs::GUI_ExtraDataManager_Geometry = "GUI/ExtraDataManager/Geometry";
 const char* UIExtraDataDefs::GUI_ExtraDataManager_SplitterHints = "GUI/ExtraDataManager/SplitterHints";
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 /* Virtual Machine: Log dialog: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 60599)
@@ -287,5 +287,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /** @name VirtualBox: Extra-data Manager window
       * @{ */
@@ -295,5 +295,5 @@
         extern const char* GUI_ExtraDataManager_SplitterHints;
     /** @} */
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
     /** @name Virtual Machine: Log dialog
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 60599)
@@ -23,5 +23,5 @@
 # include <QMutex>
 # include <QMetaEnum>
-# ifdef DEBUG
+# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 #  include <QMainWindow>
 #  include <QMenuBar>
@@ -36,5 +36,5 @@
 #  include <QComboBox>
 #  include <QPushButton>
-# endif /* DEBUG */
+# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 /* GUI includes: */
@@ -47,5 +47,5 @@
 # include "UISettingsDefs.h"
 # include "UIMessageCenter.h"
-# ifdef DEBUG
+# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 #  include "VBoxUtils.h"
 #  include "UIVirtualBoxEventHandler.h"
@@ -57,5 +57,5 @@
 #  include "QISplitter.h"
 #  include "QIDialog.h"
-# endif /* DEBUG */
+# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 /* COM includes: */
@@ -68,9 +68,9 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 # include <QStandardItemModel>
 # include <QXmlStreamWriter>
 # include <QXmlStreamReader>
-#endif
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 
@@ -276,5 +276,5 @@
 
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 /** Data fields. */
 enum Field
@@ -2010,5 +2010,5 @@
            << GUI_LogWindowGeometry;
 }
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 
@@ -2041,5 +2041,5 @@
 }
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 /* static */
 void UIExtraDataManager::openWindow(QWidget *pCenterWidget)
@@ -2048,5 +2048,5 @@
     instance()->open(pCenterWidget);
 }
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 void UIExtraDataManager::hotloadMachineExtraDataMap(const QString &strID)
@@ -3818,5 +3818,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 QRect UIExtraDataManager::extraDataManagerGeometry(QWidget *pWidget)
 {
@@ -3934,5 +3934,5 @@
     setExtraDataStringList(GUI_ExtraDataManager_SplitterHints, data);
 }
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 QRect UIExtraDataManager::logWindowGeometry(QWidget *pWidget, const QRect &defaultGeometry)
@@ -4128,10 +4128,10 @@
 }
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 void UIExtraDataManager::cleanupWindow()
 {
     delete m_pWindow;
 }
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 void UIExtraDataManager::cleanupExtraDataEventHandler()
@@ -4146,11 +4146,11 @@
     /* Cleanup extra-data event-handler: */
     cleanupExtraDataEventHandler();
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /* Cleanup window: */
     cleanupWindow();
-#endif /* DEBUG */
-}
-
-#ifdef DEBUG
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
+}
+
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 void UIExtraDataManager::open(QWidget *pCenterWidget)
 {
@@ -4169,5 +4169,5 @@
     m_pWindow->showAndRaise(pCenterWidget);
 }
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QString &strID /* = GlobalID */)
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 60599)
@@ -22,7 +22,7 @@
 #include <QObject>
 #include <QMap>
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 # include <QPointer>
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 /* GUI includes: */
@@ -31,7 +31,7 @@
 /* Forward declarations: */
 class UIExtraDataEventHandler;
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 class UIExtraDataManagerWindow;
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 /** Defines the map of extra data values. The index is an extra-data key. */
@@ -105,8 +105,8 @@
     static void destroy();
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /** Static show and raise API. */
     static void openWindow(QWidget *pCenterWidget);
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
     /** @name Base
@@ -534,5 +534,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /** @name VirtualBox: Extra-data Manager window
       * @{ */
@@ -549,5 +549,5 @@
         void setExtraDataManagerSplitterHints(const QList<int> &hints);
     /** @} */
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
     /** @name Virtual Machine: Log dialog
@@ -574,5 +574,5 @@
     /** Prepare extra-data event-handler. */
     void prepareExtraDataEventHandler();
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     // /** Prepare window. */
     // void prepareWindow();
@@ -580,5 +580,5 @@
     /** Cleanup window. */
     void cleanupWindow();
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     /** Cleanup extra-data event-handler. */
     void cleanupExtraDataEventHandler();
@@ -588,8 +588,8 @@
     void cleanup();
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /** Open window. */
     void open(QWidget *pCenterWidget);
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
     /** Retrieves an extra-data key from both machine and global sources.
@@ -630,8 +630,8 @@
     MapOfExtraDataMaps m_data;
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /** Holds Extra-data Manager window instance. */
     QPointer<UIExtraDataManagerWindow> m_pWindow;
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp	(revision 60599)
@@ -138,5 +138,5 @@
 };
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 class UIActionSimpleExtraDataManagerWindow : public UIActionSimple
 {
@@ -166,5 +166,5 @@
     }
 };
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 class UIActionSimpleExit : public UIActionSimple
@@ -1010,7 +1010,7 @@
     m_pool[UIActionIndexST_M_File_S_ImportAppliance] = new UIActionSimpleImportApplianceWizard(this);
     m_pool[UIActionIndexST_M_File_S_ExportAppliance] = new UIActionSimpleExportApplianceWizard(this);
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     m_pool[UIActionIndexST_M_File_S_ShowExtraDataManager] = new UIActionSimpleExtraDataManagerWindow(this);
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     m_pool[UIActionIndexST_M_File_S_Close] = new UIActionSimpleExit(this);
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h	(revision 60599)
@@ -36,7 +36,7 @@
     UIActionIndexST_M_File_S_ImportAppliance,
     UIActionIndexST_M_File_S_ExportAppliance,
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     UIActionIndexST_M_File_S_ShowExtraDataManager,
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     UIActionIndexST_M_File_S_Close,
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 60599)
@@ -432,10 +432,10 @@
 }
 
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
 void UISelectorWindow::sltOpenExtraDataManagerWindow()
 {
     gEDataManager->openWindow(this);
 }
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
 
 void UISelectorWindow::sltOpenPreferencesDialog()
@@ -1261,8 +1261,8 @@
     /* 'Export Appliance' action goes to 'File' menu: */
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance));
-# ifdef DEBUG
+# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /* 'Show Extra-data Manager' action goes to 'File' menu for Debug build: */
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
-# endif /* DEBUG */
+# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     /* 'Show Media Manager' action goes to 'File' menu: */
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
@@ -1280,8 +1280,8 @@
     /* Separator after 'Export Appliance' action of the 'File' menu: */
     pMenu->addSeparator();
-# ifdef DEBUG
+# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /* 'Extra-data Manager' action goes to 'File' menu for Debug build: */
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
-# endif /* DEBUG */
+# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     /* 'Show Media Manager' action goes to 'File' menu: */
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
@@ -1550,7 +1550,7 @@
     connect(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance), SIGNAL(triggered()), this, SLOT(sltOpenImportApplianceWizard()));
     connect(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance), SIGNAL(triggered()), this, SLOT(sltOpenExportApplianceWizard()));
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     connect(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager), SIGNAL(triggered()), this, SLOT(sltOpenExtraDataManagerWindow()));
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     connect(actionPool()->action(UIActionIndex_M_Application_S_Preferences), SIGNAL(triggered()), this, SLOT(sltOpenPreferencesDialog()));
     connect(actionPool()->action(UIActionIndexST_M_File_S_Close), SIGNAL(triggered()), this, SLOT(sltPerformExit()));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 60598)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 60599)
@@ -105,8 +105,8 @@
         /** Handles call to open Export Appliance wizard. */
         void sltOpenExportApplianceWizard();
-#ifdef DEBUG
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
         /** Handles call to open Extra-data Manager window. */
         void sltOpenExtraDataManagerWindow();
-#endif /* DEBUG */
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
         /** Handles call to open Preferences dialog. */
         void sltOpenPreferencesDialog();