Changeset 51010 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 9, 2014 11:04:07 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93208

Message:

another OSE build fix

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UIIconPool.cpp (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)

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

@@ -108 +108 @@
         $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM) \
         $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL) \
+        $(if $(VBOX_GUI_WITH_HIDPI),VBOX_GUI_WITH_HIDPI) \
         $(if $(VBOX_GUI_WITH_PIDFILE),VBOX_GUI_WITH_PIDFILE) \
         $(if $(VBOX_GUI_WITH_KEYS_RESET_HANDLER),VBOX_GUI_WITH_KEYS_RESET_HANDLER) \

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

@@ -219 +219 @@
 
 #ifdef Q_WS_MAC
-# ifndef VBOX_OSE
+# ifdef VBOX_GUI_WITH_HIDPI
     /* Test if HiDPI icons are enabled. Works only with a patched version of Qt 4.x
      * with the changes from https://codereview.qt-project.org/#change,54636 applied. */
@@ -233 +233 @@
             icon.addPixmap(pixmapHiDPI, mode, state);
     }
-# endif
+# endif /* VBOX_GUI_WITH_HIDPI */
 #endif /* Q_WS_MAC */
 }

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -414 +414 @@
 
 #ifdef Q_WS_MAC
-# ifndef VBOX_OSE
+# ifdef VBOX_GUI_WITH_HIDPI
         /* Enable HiDPI icons. For this we require a patched version of Qt 4.x with
          * the changes from https://codereview.qt-project.org/#change,54636 applied. */
         qApp->setAttribute(Qt::AA_UseHighDpiPixmaps);
-# endif /* !VBOX_OSE */
+# endif /* VBOX_GUI_WITH_HIDPI */
 #endif /* Q_WS_MAC */