Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStyledItemDelegate.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStyledItemDelegate.cpp	(revision 79797)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStyledItemDelegate.cpp	(revision 79798)
@@ -45,9 +45,11 @@
 
     /* Watch for editor data commits, redirect to listeners: */
-    if (m_fWatchForEditorDataCommits)
+    if (   m_fWatchForEditorDataCommits
+        && pEditor->property("has_sigCommitData").toBool())
         connect(pEditor, SIGNAL(sigCommitData(QWidget *)), this, SIGNAL(commitData(QWidget *)));
 
     /* Watch for editor Enter key triggering, redirect to listeners: */
-    if (m_fWatchForEditorEnterKeyTriggering)
+    if (   m_fWatchForEditorEnterKeyTriggering
+        && pEditor->property("has_sigEnterKeyTriggered").toBool())
         connect(pEditor, SIGNAL(sigEnterKeyTriggered()), this, SIGNAL(sigEditorEnterKeyTriggered()));
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp	(revision 79797)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp	(revision 79798)
@@ -215,4 +215,7 @@
 void UIPasswordEditor::prepare()
 {
+    /* Make sure QIStyledDelegate aware of us: */
+    setProperty("has_sigCommitData", true);
+    setProperty("has_sigEnterKeyTriggered", true);
     /* Set echo mode: */
     setEchoMode(QLineEdit::Password);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp	(revision 79797)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp	(revision 79798)
@@ -202,9 +202,4 @@
     Q_PROPERTY(TextData text READ text WRITE setText USER true);
 
-signals:
-
-    /** Notifies listener about data should be committed. */
-    void sigCommitData(QWidget *pThis);
-
 public:
 
@@ -276,9 +271,4 @@
     Q_OBJECT;
     Q_PROPERTY(RangedIntegerData rangedInteger READ rangedInteger WRITE setRangedInteger USER true);
-
-signals:
-
-    /** Notifies listener about data should be committed. */
-    void sigCommitData(QWidget *pThis);
 
 public:
@@ -604,4 +594,7 @@
     : QComboBox(pParent)
 {
+    /* Make sure QIStyledDelegate aware of us: */
+    setProperty("has_sigCommitData", true);
+    /* Configure connections: */
     connect(this, static_cast<void(ChoiceEditor::*)(int)>(&ChoiceEditor::currentIndexChanged),
             this, &ChoiceEditor::sltCurrentIndexChanged);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 79797)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 79798)
@@ -473,4 +473,6 @@
 void UIHostComboEditor::prepare()
 {
+    /* Make sure QIStyledDelegate aware of us: */
+    setProperty("has_sigCommitData", true);
     /* Configure self: */
     setAutoFillBackground(true);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp	(revision 79797)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp	(revision 79798)
@@ -127,4 +127,6 @@
     , m_fSequenceTaken(false)
 {
+    /* Make sure QIStyledDelegate aware of us: */
+    setProperty("has_sigCommitData", true);
     /* Configure self: */
     setAutoFillBackground(true);