Changeset 59869 in vbox

Timestamp:

Feb 29, 2016 11:58:15 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​bugref:8115: Mac OS X: VM settings: System page: Reverting r104281 and r104285.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -187 +187 @@
     int iParavirtProviderPosition = m_pComboParavirtProvider->findData(systemData.m_paravirtProvider);
     m_pComboParavirtProvider->setCurrentIndex(iParavirtProviderPosition == -1 ? 0 : iParavirtProviderPosition);
-    /* Force 'VT-x/AMD-V' checkbox-button to be enabled by default as it is always used/enabled on Mac OS X: */
-#ifdef Q_WS_MAC
-    m_pCheckBoxVirtualization->setChecked(true);
-#else /* !Q_WS_MAC */
     m_pCheckBoxVirtualization->setChecked(systemData.m_fEnabledHwVirtEx);
-#endif /* !Q_WS_MAC */
     m_pCheckBoxNestedPaging->setChecked(systemData.m_fEnabledNestedPaging);
 
@@ -510 +505 @@
     m_pComboParavirtProvider->setEnabled(isMachineOffline());
     m_pLabelVirtualization->setEnabled(isMachineOffline());
-    /* Prevent user from toggling 'VT-x/AMD-V' checkbox-button as it is always used/enabled on Mac OS X: */
-#ifdef Q_WS_MAC
-    m_pCheckBoxVirtualization->setEnabled(false);
-#else /* !Q_WS_MAC */
     m_pCheckBoxVirtualization->setEnabled(isMachineOffline());
-#endif /* !Q_WS_MAC */
     m_pCheckBoxNestedPaging->setEnabled(isMachineOffline() && m_pCheckBoxVirtualization->isChecked());
 }