Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 69823)
+++ /trunk/Config.kmk	(revision 69824)
@@ -618,6 +618,4 @@
  VBOX_WITH_COCOA_QT = 1
 endif
-# HiDPI support for OS X
-VBOX_GUI_WITH_HIDPI = 1
 # The SDL based GUI.
 VBOX_WITH_VBOXSDL = 1
@@ -1190,5 +1188,4 @@
   VBOX_WITH_AUDIO_VIDEOREC=
  endif
- VBOX_GUI_WITH_HIDPI=
  # branding
  VBOX_BRAND_LICENSE_HTML             := $(PATH_ROOT)/doc/License-gpl-2.0.html
Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 69823)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 69824)
@@ -136,5 +136,4 @@
 	$(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) \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 69823)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 69824)
@@ -245,13 +245,7 @@
 
 #ifdef VBOX_WS_MAC
-# 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. */
+    /* Test if HiDPI icons are enabled: */
     if (!qApp->testAttribute(Qt::AA_UseHighDpiPixmaps))
         return;
-# else /* !VBOX_GUI_WITH_HIDPI */
-    /* Otherwise HiDPI icons are useless: */
-    return;
-# endif /* !VBOX_GUI_WITH_HIDPI */
 #endif /* VBOX_WS_MAC */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp	(revision 69823)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp	(revision 69824)
@@ -412,10 +412,6 @@
 
 #ifdef VBOX_WS_MAC
-# 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. */
+        /* Enable HiDPI icons: */
         a.setAttribute(Qt::AA_UseHighDpiPixmaps);
-# endif /* VBOX_GUI_WITH_HIDPI */
 
         /* Disable menu icons on MacOS X host: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm	(revision 69823)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm	(revision 69824)
@@ -91,5 +91,4 @@
     NativeNSImageRef pNSImage = ::darwinToNSImageRef(pCGImage);
     CGImageRelease(pCGImage);
-#ifdef VBOX_GUI_WITH_HIDPI
     /* Apply device pixel ratio: */
     double dScaleFactor = pImage->devicePixelRatio();
@@ -97,5 +96,4 @@
                          (CGFloat)pImage->height() / dScaleFactor };
     [pNSImage setSize:imageSize];
-#endif /* VBOX_GUI_WITH_HIDPI */
     /* Return result: */
     return pNSImage;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp	(revision 69823)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp	(revision 69824)
@@ -1521,7 +1521,6 @@
 
 #ifdef VBOX_WS_MAC
-# ifdef VBOX_GUI_WITH_HIDPI
         /* Should we
-         * do not perform logical HiDPI scaling or
+         * not perform logical HiDPI scaling or
          * perform logical HiDPI scaling and optimize it for performance? */
         if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance)
@@ -1530,5 +1529,4 @@
             subPixmap.setDevicePixelRatio(dBackingScaleFactor);
         }
-# endif /* VBOX_GUI_WITH_HIDPI */
 #endif /* VBOX_WS_MAC */
     }
@@ -1581,7 +1579,6 @@
 
 #ifdef VBOX_WS_MAC
-# ifdef VBOX_GUI_WITH_HIDPI
         /* Should we
-         * do not perform logical HiDPI scaling or
+         * not perform logical HiDPI scaling or
          * perform logical HiDPI scaling and optimize it for performance? */
         if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance)
@@ -1590,5 +1587,4 @@
             subPixmap.setDevicePixelRatio(dBackingScaleFactor);
         }
-# endif /* VBOX_GUI_WITH_HIDPI */
 #endif /* VBOX_WS_MAC */
     }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp	(revision 69823)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp	(revision 69824)
@@ -1121,10 +1121,8 @@
     m_pausePixmap = QPixmap::fromImage(screenShot);
 #ifdef VBOX_WS_MAC
-# ifdef VBOX_GUI_WITH_HIDPI
     /* Adjust backing-scale-factor if necessary: */
     const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
     if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
         m_pausePixmap.setDevicePixelRatio(dBackingScaleFactor);
-# endif /* VBOX_GUI_WITH_HIDPI */
 #endif /* VBOX_WS_MAC */
 
@@ -1158,10 +1156,8 @@
     m_pausePixmap = QPixmap::fromImage(screenShot);
 #ifdef VBOX_WS_MAC
-# ifdef VBOX_GUI_WITH_HIDPI
     /* Adjust backing-scale-factor if necessary: */
     const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
     if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
         m_pausePixmap.setDevicePixelRatio(dBackingScaleFactor);
-# endif /* VBOX_GUI_WITH_HIDPI */
 #endif /* VBOX_WS_MAC */
 
@@ -1184,10 +1180,8 @@
     m_pausePixmapScaled = pausePixmap().scaled(scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 #ifdef VBOX_WS_MAC
-# ifdef VBOX_GUI_WITH_HIDPI
     /* Adjust backing-scale-factor if necessary: */
     const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
     if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
         m_pausePixmapScaled.setDevicePixelRatio(dBackingScaleFactor);
-# endif /* VBOX_GUI_WITH_HIDPI */
 #endif /* VBOX_WS_MAC */
 }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp	(revision 69823)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp	(revision 69824)
@@ -1777,5 +1777,4 @@
     QPixmap cursorPixmap = QPixmap::fromImage(image);
 # ifdef VBOX_WS_MAC
-#  ifdef VBOX_GUI_WITH_HIDPI
     /* Adjust backing-scale-factor: */
     /// @todo In case of multi-monitor setup check whether backing-scale factor and cursor are screen specific.
@@ -1791,5 +1790,4 @@
         cursorPixmap.setDevicePixelRatio(dBackingScaleFactor);
     }
-#  endif /* VBOX_GUI_WITH_HIDPI */
 # endif /* VBOX_WS_MAC */
     /* Set the new cursor: */