forked from jengelh/virtualbox
- Version bump to 5.0.0:
* Major bump from 4 series with tons of changes. * Read upstream changelog for in-depth informations - Obsoleted patches: * gcc5-support.patch * gcc51-support.patch - Refreshed patches: * gcc5-real-support.patch * vbox-disable-updates.diff * virtualbox-system-x.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=206
This commit is contained in:
committed by
Git OBS Bridge
parent
5ac0532338
commit
77d1328616
@@ -1,8 +1,7 @@
|
||||
Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
@@ -62,7 +62,7 @@ void UIGlobalSettingsUpdate::loadToCache
|
||||
diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
--- VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp 2015-07-11 13:17:27.885699492 +0200
|
||||
+++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp 2015-07-11 13:21:56.912197474 +0200
|
||||
@@ -68,7 +68,7 @@
|
||||
void UIGlobalSettingsUpdate::getFromCache()
|
||||
{
|
||||
/* Apply internal variables data to QWidget(s): */
|
||||
@@ -11,27 +10,27 @@ Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.
|
||||
if (m_pCheckBoxUpdate->isChecked())
|
||||
{
|
||||
m_pComboBoxUpdatePeriod->setCurrentIndex(m_cache.m_periodIndex);
|
||||
Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
@@ -359,15 +359,6 @@ UISettingsDialogGlobal::UISettingsDialog
|
||||
diff -urN VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
--- VirtualBox-5.0.0.old/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-07-11 13:17:27.885699492 +0200
|
||||
+++ VirtualBox-5.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2015-07-11 13:23:13.230338850 +0200
|
||||
@@ -106,16 +106,6 @@
|
||||
iPageIndex, "#input", pSettingsPage);
|
||||
break;
|
||||
}
|
||||
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||
- /* Update page: */
|
||||
- case GlobalSettingsPageType_Update:
|
||||
- {
|
||||
- pSettingsPage = new UIGlobalSettingsUpdate;
|
||||
- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
|
||||
- ":/refresh_16px.png", ":/refresh_disabled_16px.png",
|
||||
- addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
|
||||
- iPageIndex, "#update", pSettingsPage);
|
||||
- break;
|
||||
- }
|
||||
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
|
||||
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
|
||||
/* Language page: */
|
||||
case GlobalSettingsPageType_Language:
|
||||
@@ -498,8 +489,6 @@ void UISettingsDialogGlobal::retranslate
|
||||
{
|
||||
@@ -254,8 +244,6 @@
|
||||
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
|
||||
|
||||
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||
|
Reference in New Issue
Block a user