Changeset 78724 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 24, 2019 12:28:59 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: Make VBOX_GUI_WITH_NEW_MEDIA_EVENTS define global for whole the GUI (disabled for now), we can need it in various places.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/medium/UIMediumEnumerator.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -85 +85 @@
 VBOX_WITH_UPDATE_REQUEST := 1
 endif
+
+
+#
+# Use newly intruduced global media related events for
+# medium enumeration purposes.
+#
+#VBOX_GUI_WITH_NEW_MEDIA_EVENTS := 1
 
 
@@ -111 +118 @@
         $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
+        $(if $(VBOX_GUI_WITH_NEW_MEDIA_EVENTS),VBOX_GUI_WITH_NEW_MEDIA_EVENTS) \
         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \
         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA) \
@@ -180 +188 @@
         $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
+        $(if $(VBOX_GUI_WITH_NEW_MEDIA_EVENTS),VBOX_GUI_WITH_NEW_MEDIA_EVENTS) \
         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \
         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA) \
@@ -242 +251 @@
 VBoxGlobal_DEFS         += \
         $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
+        $(if $(VBOX_GUI_WITH_NEW_MEDIA_EVENTS),VBOX_GUI_WITH_NEW_MEDIA_EVENTS) \
         $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \
         $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA) \

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -21 +21 @@
 # pragma once
 #endif
-
-//#define VBOX_GUI_WITH_NEW_MEDIA_EVENTS
 
 /* Qt includes: */