Index: trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 60362)
@@ -113,15 +113,12 @@
 VirtualBox_DEFS.win       += UNICODE QT_DLL
 ifdef VBOX_WITH_ICHAT_THEATER
- VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
-endif
-ifdef VBOX_WITH_QTGUI_V5
- # These important for us Qt4 defines missed in Qt5:
- VirtualBox_DEFS.linux     += Q_WS_X11
- VirtualBox_DEFS.solaris   += Q_WS_X11
- VirtualBox_DEFS.freebsd   += Q_WS_X11
- VirtualBox_DEFS.darwin    += Q_WS_MAC
- VirtualBox_DEFS.win       += Q_WS_WIN
-endif # VBOX_WITH_QTGUI_V5
-VirtualBox_DEFS          += \
+ VirtualBox_DEFS.darwin   += VBOX_WITH_ICHAT_THEATER
+endif
+VirtualBox_DEFS.linux     += VBOX_WS_X11
+VirtualBox_DEFS.solaris   += VBOX_WS_X11
+VirtualBox_DEFS.freebsd   += VBOX_WS_X11
+VirtualBox_DEFS.darwin    += VBOX_WS_MAC
+VirtualBox_DEFS.win       += VBOX_WS_WIN
+VirtualBox_DEFS           += \
 	$(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
 	$(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
Index: trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp	(revision 60362)
@@ -42,10 +42,10 @@
     : QIWithRetranslateUI<QIDialog>(pParent)
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     setWindowFlags(Qt::Sheet);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Enable size-grip: */
     setSizeGripEnabled(true);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Search for corresponding medium: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp	(revision 60362)
@@ -341,10 +341,10 @@
             if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
             {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                 QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
                 m_geometry.moveTo(pMoveEvent->pos());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
                 m_geometry.moveTo(geometry().x(), geometry().y());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             }
             break;
@@ -402,11 +402,11 @@
     connect(m_pMachineWindow, SIGNAL(destroyed(QObject*)), this, SLOT(suicide()));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* No window-icon on Mac OX X, because it acts as proxy icon which isn't necessary here. */
     setWindowIcon(QIcon());
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     /* Assign window-icon(s: */
     setWindowIcon(UIIconPool::iconSetFull(":/session_info_32px.png", ":/session_info_16px.png"));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Prepare central-widget: */
@@ -521,10 +521,10 @@
         /* Load geometry: */
         m_geometry = gEDataManager->informationWindowGeometry(this, m_pMachineWindow, vboxGlobal().managedVMUuid());
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         move(m_geometry.topLeft());
         resize(m_geometry.size());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         setGeometry(m_geometry);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIVMInfoDialog: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
@@ -541,9 +541,9 @@
     {
         /* Save geometry: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         gEDataManager->setInformationWindowGeometry(m_geometry, ::darwinIsWindowMaximized(this), vboxGlobal().managedVMUuid());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         gEDataManager->setInformationWindowGeometry(m_geometry, isMaximized(), vboxGlobal().managedVMUuid());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIVMInfoDialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
Index: trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp	(revision 60362)
@@ -183,9 +183,9 @@
                 m_pNextPrevButtons->setEnabled(0, false);
                 m_pNextPrevButtons->setEnabled(1, false);
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
                 /* No icons on the Mac: */
                 m_pNextPrevButtons->setIcon(0, UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack, this));
                 m_pNextPrevButtons->setIcon(1, UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
                 /* Add Next/Prev button-box to main-layout: */
                 m_pMainLayout->addWidget(m_pNextPrevButtons);
@@ -1029,10 +1029,10 @@
         /* Load geometry: */
         m_geometry = gEDataManager->logWindowGeometry(this, defaultGeometry);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         move(m_geometry.topLeft());
         resize(m_geometry.size());
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
         setGeometry(m_geometry);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIVMLogViewer: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
@@ -1050,9 +1050,9 @@
         /* Save geometry: */
         const QRect saveGeometry = geometry();
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         gEDataManager->setLogWindowGeometry(saveGeometry, ::darwinIsWindowMaximized(this));
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
         gEDataManager->setLogWindowGeometry(saveGeometry, isMaximized());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIVMLogViewer: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
                  saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height()));
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp	(revision 60362)
@@ -47,7 +47,7 @@
 # include <VBox/VBoxGL2D.h>
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -4444,5 +4444,5 @@
     }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Take the backing-scale-factor into account: */
     if (mSizeInfo.useUnscaledHiDPIOutput())
@@ -4457,5 +4457,5 @@
         }
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* we do not to miss notify updates, because we have to update bg textures for it,
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp	(revision 60362)
@@ -35,8 +35,8 @@
 # include "CVirtualBox.h"
 
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 /* Namespaces: */
 using namespace UIExtraDataDefs;
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -52,9 +52,9 @@
 {
     /* default settings */
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
     hostCombo = "163"; // VK_RCONTROL
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
     hostCombo = "65508"; // XK_Control_R
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
     hostCombo = "55"; // QZ_LMETA
 #else
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp	(revision 60362)
@@ -40,5 +40,5 @@
     , mDisagreeButton (0)
 {
-#ifndef Q_WS_WIN
+#ifndef VBOX_WS_WIN
     /* Application icon. On Win32, it's built-in to the executable. */
     setWindowIcon (QIcon (":/VirtualBox_48px.png"));
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp	(revision 60362)
@@ -27,8 +27,8 @@
 # include "UIMessageCenter.h"
 # include "VBoxUtils.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "UIMachineWindowNormal.h"
 #  include "VBoxSnapshotsWgt.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h	(revision 60362)
@@ -82,7 +82,7 @@
 template<> bool canConvert<UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType>();
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 template<> bool canConvert<UIExtraDataMetaDefs::MenuWindowActionType>();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 template<> bool canConvert<UIVisualStateType>();
 template<> bool canConvert<DetailsElementType>();
@@ -99,7 +99,7 @@
 template<> bool canConvert<ScalingOptimizationType>();
 template<> bool canConvert<HiDPIOptimizationType>();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 template<> bool canConvert<MiniToolbarAlignment>();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 /* Declare COM canConvert specializations: */
@@ -151,8 +151,8 @@
 template<> UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType fromInternalString<UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType>(const QString &strRuntimeMenuDebuggerActionType);
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 template<> QString toInternalString(const UIExtraDataMetaDefs::MenuWindowActionType &menuWindowActionType);
 template<> UIExtraDataMetaDefs::MenuWindowActionType fromInternalString<UIExtraDataMetaDefs::MenuWindowActionType>(const QString &strMenuWindowActionType);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 template<> QString toInternalString(const UIVisualStateType &visualStateType);
 template<> UIVisualStateType fromInternalString<UIVisualStateType>(const QString &strVisualStateType);
@@ -188,8 +188,8 @@
 template<> QString toInternalString(const HiDPIOptimizationType &optimizationType);
 template<> HiDPIOptimizationType fromInternalString<HiDPIOptimizationType>(const QString &strOptimizationType);
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 template<> QString toInternalString(const MiniToolbarAlignment &miniToolbarAlignment);
 template<> MiniToolbarAlignment fromInternalString<MiniToolbarAlignment>(const QString &strMiniToolbarAlignment);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 template<> QString toString(const InformationElementType &informationElementType);
 template<> InformationElementType fromString<InformationElementType>(const QString &strInformationElementType);
Index: trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp	(revision 60362)
@@ -49,7 +49,7 @@
 template<> bool canConvert<UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType>() { return true; }
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 template<> bool canConvert<UIExtraDataMetaDefs::MenuWindowActionType>() { return true; }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 template<> bool canConvert<UIVisualStateType>() { return true; }
 template<> bool canConvert<DetailsElementType>() { return true; }
@@ -66,7 +66,7 @@
 template<> bool canConvert<ScalingOptimizationType>() { return true; }
 template<> bool canConvert<HiDPIOptimizationType>() { return true; }
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 template<> bool canConvert<MiniToolbarAlignment>() { return true; }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 /* QString <= SizeSuffix: */
@@ -445,7 +445,7 @@
     switch (menuApplicationActionType)
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         case UIExtraDataMetaDefs::MenuApplicationActionType_About:                strResult = "About"; break;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         case UIExtraDataMetaDefs::MenuApplicationActionType_Preferences:          strResult = "Preferences"; break;
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -471,7 +471,7 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;               QList<UIExtraDataMetaDefs::MenuApplicationActionType> values;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     keys << "About";                values << UIExtraDataMetaDefs::MenuApplicationActionType_About;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     keys << "Preferences";          values << UIExtraDataMetaDefs::MenuApplicationActionType_Preferences;
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -497,7 +497,7 @@
         case UIExtraDataMetaDefs::MenuHelpActionType_Contents:             strResult = "Contents"; break;
         case UIExtraDataMetaDefs::MenuHelpActionType_WebSite:              strResult = "WebSite"; break;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         case UIExtraDataMetaDefs::MenuHelpActionType_About:                strResult = "About"; break;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         case UIExtraDataMetaDefs::MenuHelpActionType_All:                  strResult = "All"; break;
         default:
@@ -518,7 +518,7 @@
     keys << "Contents";             values << UIExtraDataMetaDefs::MenuHelpActionType_Contents;
     keys << "WebSite";              values << UIExtraDataMetaDefs::MenuHelpActionType_WebSite;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     keys << "About";                values << UIExtraDataMetaDefs::MenuHelpActionType_About;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     keys << "All";                  values << UIExtraDataMetaDefs::MenuHelpActionType_All;
     /* Invalid type for unknown words: */
@@ -586,7 +586,7 @@
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_Seamless:             strResult = "Seamless"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_Scale:                strResult = "Scale"; break;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_MinimizeWindow:       strResult = "MinimizeWindow"; break;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_AdjustWindow:         strResult = "AdjustWindow"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_GuestAutoresize:      strResult = "GuestAutoresize"; break;
@@ -598,7 +598,7 @@
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBar:              strResult = "MenuBar"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBarSettings:      strResult = "MenuBarSettings"; break;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_ToggleMenuBar:        strResult = "ToggleMenuBar"; break;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_StatusBar:            strResult = "StatusBar"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_StatusBarSettings:    strResult = "StatusBarSettings"; break;
@@ -626,7 +626,7 @@
     keys << "Seamless";             values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_Seamless;
     keys << "Scale";                values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_Scale;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     keys << "MinimizeWindow";       values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_MinimizeWindow;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     keys << "AdjustWindow";         values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_AdjustWindow;
     keys << "GuestAutoresize";      values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_GuestAutoresize;
@@ -638,7 +638,7 @@
     keys << "MenuBar";              values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBar;
     keys << "MenuBarSettings";      values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBarSettings;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     keys << "ToggleMenuBar";        values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_ToggleMenuBar;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     keys << "StatusBar";            values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_StatusBar;
     keys << "StatusBarSettings";    values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_StatusBarSettings;
@@ -664,7 +664,7 @@
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_KeyboardSettings:  strResult = "KeyboardSettings"; break;
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCAD:           strResult = "TypeCAD"; break;
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCABS:          strResult = "TypeCABS"; break;
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak:     strResult = "TypeCtrlBreak"; break;
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert:        strResult = "TypeInsert"; break;
@@ -690,7 +690,7 @@
     keys << "KeyboardSettings";  values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_KeyboardSettings;
     keys << "TypeCAD";           values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCAD;
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     keys << "TypeCABS";          values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCABS;
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     keys << "TypeCtrlBreak";     values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak;
     keys << "TypeInsert";        values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert;
@@ -805,5 +805,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 /* QString <= UIExtraDataMetaDefs::MenuWindowActionType: */
 template<> QString toInternalString(const UIExtraDataMetaDefs::MenuWindowActionType &menuWindowActionType)
@@ -839,5 +839,5 @@
     return values.at(keys.indexOf(QRegExp(strMenuWindowActionType, Qt::CaseInsensitive)));
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* QString <= UIVisualStateType: */
@@ -1544,5 +1544,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 /* QString <= MiniToolbarAlignment: */
 template<> QString toInternalString(const MiniToolbarAlignment &miniToolbarAlignment)
@@ -1573,5 +1573,5 @@
     return values.at(keys.indexOf(QRegExp(strMiniToolbarAlignment, Qt::CaseInsensitive)));
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 /* QString <= InformationElementType: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp	(revision 60362)
@@ -77,5 +77,5 @@
         /* We want to acquire SC_SliderTickmarks sub-control rectangle
          * and fill it with necessary background colors: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Under MacOS X SC_SliderTickmarks is not fully reliable
          * source of the information we need, providing us with incorrect width.
@@ -83,5 +83,5 @@
         QRect ticks = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderTickmarks, this);
         ticks.setRect((s.width() - available) / 2, s.height() - ticks.y(), available, ticks.height());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         /* Under Windows SC_SliderTickmarks is fully unreliable
          * source of the information we need, providing us with empty rectangle.
@@ -93,5 +93,5 @@
                       style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderGroove, this);
         ticks.setRect((s.width() - available) / 2, ticks.bottom() + 1, available, s.height() - ticks.bottom() - 1);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
         if ((m_minOpt != -1 &&
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedToolBar.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedToolBar.cpp	(revision 60362)
@@ -79,7 +79,7 @@
     /* Create main-layout: */
     m_pMainLayout = new QHBoxLayout(this);
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
     m_pMainLayout->setContentsMargins(1, 1, 1, 1);
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
     m_pMainLayout->setContentsMargins(0, 0, 0, 0);
 #else
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp	(revision 60362)
@@ -125,8 +125,8 @@
     /* Make sure layout is polished: */
     adjustSize();
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* And dialog have fixed size: */
     setFixedSize(size());
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Explicit centering according to our parent: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp	(revision 60362)
@@ -26,5 +26,5 @@
 # include "QIFileDialog.h"
 
-# ifdef Q_WS_WIN
+# ifdef VBOX_WS_WIN
 /* Qt includes */
 #  include <QEvent>
@@ -34,10 +34,10 @@
 /* WinAPI includes */
 #  include "shlobj.h"
-# endif /* !Q_WS_WIN */
+# endif /* !VBOX_WS_WIN */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 
 static QString extractFilter (const QString &aRawFilter)
@@ -210,5 +210,5 @@
 };
 
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 QIFileDialog::QIFileDialog (QWidget *aParent, Qt::WindowFlags aFlags)
@@ -235,5 +235,5 @@
                                             bool aResolveSymlinks)
 {
-#if defined(Q_WS_WIN) && (QT_VERSION < 0x050000)
+#if defined(VBOX_WS_WIN) && (QT_VERSION < 0x050000)
 
     /**
@@ -325,5 +325,5 @@
     return loopObject.result();
 
-#elif defined (Q_WS_X11) && (QT_VERSION < 0x040400)
+#elif defined (VBOX_WS_X11) && (QT_VERSION < 0x040400)
 
     /* Here is workaround for Qt4.3 bug with QFileDialog which crushes when
@@ -343,5 +343,5 @@
     }
     return dlg.exec() ? dlg.selectedFiles() [0] : QString::null;
-#elif defined (Q_WS_MAC) && (QT_VERSION >= 0x040600)
+#elif defined (VBOX_WS_MAC) && (QT_VERSION >= 0x040600)
 
     /* After 4.5 exec ignores the Qt::Sheet flag.
@@ -366,5 +366,5 @@
 
     QFileDialog::Options o;
-# if defined (Q_WS_X11)
+# if defined (VBOX_WS_X11)
     /** @todo see http://bugs.kde.org/show_bug.cgi?id=210904, make it conditional
      *        when this bug is fixed (xtracker 5167).
@@ -403,5 +403,5 @@
                                        bool           fConfirmOverwrite /* = false */)
 {
-#if defined(Q_WS_WIN) && (QT_VERSION < 0x050000)
+#if defined(VBOX_WS_WIN) && (QT_VERSION < 0x050000)
 
     /* Further code (WinAPI call to GetSaveFileName() in other thread)
@@ -540,5 +540,5 @@
     return loopObject.result();
 
-#elif defined (Q_WS_X11) && (QT_VERSION < 0x040400)
+#elif defined (VBOX_WS_X11) && (QT_VERSION < 0x040400)
 
     /* Here is workaround for Qt4.3 bug with QFileDialog which crushes when
@@ -564,5 +564,5 @@
     return dlg.exec() == QDialog::Accepted ? dlg.selectedFiles().value (0, "") : QString::null;
 
-#elif defined (Q_WS_MAC) && (QT_VERSION >= 0x040600) && (QT_VERSION < 0x050000)
+#elif defined (VBOX_WS_MAC) && (QT_VERSION >= 0x040600) && (QT_VERSION < 0x050000)
 
     /* After 4.5 exec ignores the Qt::Sheet flag.
@@ -602,5 +602,5 @@
 
     QFileDialog::Options o;
-# if defined (Q_WS_X11)
+# if defined (VBOX_WS_X11)
     /** @todo see http://bugs.kde.org/show_bug.cgi?id=210904, make it conditional
      *        when this bug is fixed (xtracker 5167)
@@ -671,5 +671,5 @@
 {
 /* It seems, running QFileDialog in separate thread is NOT needed under windows any more: */
-#if defined (Q_WS_WIN) && (QT_VERSION < 0x040403)
+#if defined (VBOX_WS_WIN) && (QT_VERSION < 0x040403)
 
     /**
@@ -796,5 +796,5 @@
     return QStringList() << loopObject.result();
 
-#elif defined (Q_WS_X11) && (QT_VERSION < 0x040400)
+#elif defined (VBOX_WS_X11) && (QT_VERSION < 0x040400)
 
     /* Here is workaround for Qt4.3 bug with QFileDialog which crushes when
@@ -821,5 +821,5 @@
     return dlg.exec() == QDialog::Accepted ? dlg.selectedFiles() : QStringList() << QString::null;
 
-#elif defined (Q_WS_MAC) && (QT_VERSION >= 0x040600) && (QT_VERSION < 0x050000)
+#elif defined (VBOX_WS_MAC) && (QT_VERSION >= 0x040600) && (QT_VERSION < 0x050000)
 
     /* After 4.5 exec ignores the Qt::Sheet flag.
@@ -862,5 +862,5 @@
     if (!aResolveSymlinks)
         o |= QFileDialog::DontResolveSymlinks;
-# if defined (Q_WS_X11)
+# if defined (VBOX_WS_X11)
     /** @todo see http://bugs.kde.org/show_bug.cgi?id=210904, make it conditional
      *        when this bug is fixed (xtracker 5167)
@@ -901,5 +901,5 @@
 }
 
-#if defined Q_WS_WIN
+#if defined VBOX_WS_WIN
 #include "QIFileDialog.moc"
 #endif
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp	(revision 60362)
@@ -22,7 +22,7 @@
 /* Qt includes: */
 # if QT_VERSION < 0x050000
-#  ifdef Q_WS_WIN
+#  ifdef VBOX_WS_WIN
 #   include <QLibrary>
-#  endif /* Q_WS_WIN */
+#  endif /* VBOX_WS_WIN */
 # endif /* QT_VERSION < 0x050000 */
 
@@ -32,14 +32,14 @@
 /* Other VBox includes: */
 # if QT_VERSION < 0x050000
-#  ifdef Q_WS_WIN
+#  ifdef VBOX_WS_WIN
 #   include "iprt/ldr.h"
-#  endif /* Q_WS_WIN */
+#  endif /* VBOX_WS_WIN */
 # endif /* QT_VERSION < 0x050000 */
 
 /* External includes: */
 # if QT_VERSION < 0x050000
-#  ifdef Q_WS_WIN
+#  ifdef VBOX_WS_WIN
 #   include <Windows.h>
-#  endif /* Q_WS_WIN */
+#  endif /* VBOX_WS_WIN */
 # endif /* QT_VERSION < 0x050000 */
 
@@ -49,7 +49,7 @@
 #include <QStyleOptionFrame>
 #if QT_VERSION < 0x050000
-# ifdef Q_WS_WIN
+# ifdef VBOX_WS_WIN
 #  include <QWindowsVistaStyle>
-# endif /* Q_WS_WIN */
+# endif /* VBOX_WS_WIN */
 #endif /* QT_VERSION < 0x050000 */
 
@@ -81,5 +81,5 @@
 
 #if QT_VERSION < 0x050000
-# ifdef Q_WS_WIN
+# ifdef VBOX_WS_WIN
     /* Vista l&f style has a bug where the last parameter of sizeFromContents
      * function ('widget' what corresponds to 'this' in our class) is ignored.
@@ -98,5 +98,5 @@
             sa -= QSize(23, 0);
     }
-# endif /* Q_WS_WIN */
+# endif /* VBOX_WS_WIN */
 #endif /* QT_VERSION < 0x050000 */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp	(revision 60362)
@@ -22,17 +22,17 @@
 /* Qt includes: */
 # include <QtGlobal>
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <QApplication>
 #  include <QPainter>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 /* Qt includes: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # if QT_VERSION < 0x050000
 #  include <qmacstyle_mac.h>
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -43,5 +43,5 @@
     :QListView (aParent)
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Track if the application lost the focus */
     connect (QCoreApplication::instance(), SIGNAL (focusChanged (QWidget *, QWidget *)),
@@ -57,10 +57,10 @@
     static_cast<QMacStyle *> (style())->setFocusRectPolicy (this, QMacStyle::FocusDisabled);
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
 void QIListView::focusChanged (QWidget * /* aOld */, QWidget *aNow)
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     QColor bgColor (212, 221, 229);
     if (aNow == NULL)
@@ -70,7 +70,7 @@
     viewport()->setPalette (pal);
     viewport()->setAutoFillBackground(true);
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     Q_UNUSED (aNow);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -80,5 +80,5 @@
                                      const QModelIndex &aIndex) const
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     Q_UNUSED (aIndex);
     /* Macify for Leopard */
@@ -122,7 +122,7 @@
         aPainter->fillRect(aOption.rect, bgColor);
     }
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     QItemDelegate::drawBackground (aPainter, aOption, aIndex);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp	(revision 60362)
@@ -230,5 +230,5 @@
             break;
         }
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Special handling for Period key: */
         case Qt::Key_Period:
@@ -241,5 +241,5 @@
             break;
         }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         /* Special handling for Return/Enter key: */
         case Qt::Key_Return:
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMenu.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMenu.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMenu.cpp	(revision 60362)
@@ -31,8 +31,8 @@
 void QIMenu::sltHighlightFirstAction()
 {
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Windows host requires window-activation: */
     activateWindow();
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
     /* Focus next child: */
     QMenu::focusNextChild();
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp	(revision 60362)
@@ -171,11 +171,11 @@
     {
         /* Configure main-layout: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         pMainLayout->setContentsMargins(40, 11, 40, 11);
         pMainLayout->setSpacing(15);
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
         pMainLayout->setContentsMargins(11, 11, 11, 11);
         pMainLayout->setSpacing(10);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /* Create top-layout: */
         QHBoxLayout *pTopLayout = new QHBoxLayout;
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp	(revision 60362)
@@ -24,7 +24,7 @@
 
 /* External includes: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # include <sys/wait.h>
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -49,9 +49,9 @@
         result = process.readAllStandardOutput();
     process.setProcessState(QProcess::NotRunning);
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     int iStatus;
     if (process.pid() > 0)
         waitpid(process.pid(), &iStatus, 0);
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     return result;
 }
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp	(revision 60362)
@@ -146,7 +146,7 @@
     , m_fPolished(false)
     , m_type(Shade)
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     , m_fHandleGrabbed(false)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 {
     qApp->installEventFilter(this);
@@ -157,7 +157,7 @@
     , m_fPolished(false)
     , m_type(Shade)
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     , m_fHandleGrabbed(false)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 {
     qApp->installEventFilter (this);
@@ -177,5 +177,5 @@
         }
     }
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Special handling on the Mac. Cause there the horizontal handle is only 1
      * pixel wide, its hard to catch. Therefor we make some invisible area
@@ -255,5 +255,5 @@
         }
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     return QSplitter::eventFilter(pWatched, pEvent);
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.h	(revision 60362)
@@ -51,7 +51,7 @@
     bool m_fPolished;
     Type m_type;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     bool m_fHandleGrabbed;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     QColor m_color1;
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp	(revision 60362)
@@ -27,7 +27,7 @@
 # include <QStyle>
 # include <QLabel>
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <QContextMenuEvent>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -45,5 +45,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void QIStatusBarIndicator::mousePressEvent(QMouseEvent *pEvent)
 {
@@ -64,5 +64,5 @@
         QWidget::mousePressEvent(pEvent);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void QIStatusBarIndicator::mouseDoubleClickEvent(QMouseEvent *pEvent)
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.h	(revision 60362)
@@ -49,10 +49,10 @@
 protected:
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Mouse-press-event handler.
       *           Make the left button also show the context-menu to make things
       *           simpler for users with single mouse button mice (laptops++). */
     virtual void mousePressEvent(QMouseEvent *pEvent);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** Mouse-double-click-event handler. */
     virtual void mouseDoubleClickEvent(QMouseEvent *pEvent);
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITabWidget.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITabWidget.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITabWidget.h	(revision 60362)
@@ -33,9 +33,9 @@
         :QTabWidget(pParent)
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* I don't know why, but for some languages there is ElideRight the
            default on Mac OS X. Fix this. */
         setElideMode(Qt::ElideNone);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     }
 };
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolButton.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolButton.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolButton.h	(revision 60362)
@@ -32,12 +32,12 @@
         : QToolButton(pParent)
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Keep size-hint alive: */
         const QSize sh = sizeHint();
         setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
         setFixedSize(sh);
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
         setAutoRaise(true);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 
@@ -45,11 +45,11 @@
     virtual void setAutoRaise(bool fEnable)
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Ignore for Mac OS X: */
         Q_UNUSED(fEnable);
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
         /* Call to base-class: */
         QToolButton::setAutoRaise(fEnable);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.h	(revision 60362)
@@ -25,7 +25,7 @@
 
 /* External includes: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 #include <limits.h>
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* Forward declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 60362)
@@ -82,14 +82,14 @@
 const char* UIExtraDataDefs::GUI_PreventSnapshotOperations = "GUI/PreventSnapshotOperations";
 const char* UIExtraDataDefs::GUI_FirstRun = "GUI/FirstRun";
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 const char* UIExtraDataDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";
 const char* UIExtraDataDefs::GUI_MachineWindowNamePostfix = "GUI/MachineWindowNamePostfix";
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 const char* UIExtraDataDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition";
 const char* UIExtraDataDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition";
 const char* UIExtraDataDefs::GUI_Geometry_State_Max = "max";
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 const char* UIExtraDataDefs::GUI_MenuBar_Enabled = "GUI/MenuBar/Enabled";
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 const char* UIExtraDataDefs::GUI_RestrictedRuntimeMenus = "GUI/RestrictedRuntimeMenus";
 const char* UIExtraDataDefs::GUI_RestrictedRuntimeApplicationMenuActions = "GUI/RestrictedRuntimeApplicationMenuActions";
@@ -101,7 +101,7 @@
 const char* UIExtraDataDefs::GUI_RestrictedRuntimeDebuggerMenuActions = "GUI/RestrictedRuntimeDebuggerMenuActions";
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 const char* UIExtraDataDefs::GUI_RestrictedRuntimeWindowMenuActions = "GUI/RestrictedRuntimeWindowMenuActions";
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 const char* UIExtraDataDefs::GUI_RestrictedRuntimeHelpMenuActions = "GUI/RestrictedRuntimeHelpMenuActions";
 const char* UIExtraDataDefs::GUI_RestrictedVisualStates = "GUI/RestrictedVisualStates";
@@ -109,7 +109,7 @@
 const char* UIExtraDataDefs::GUI_Seamless = "GUI/Seamless";
 const char* UIExtraDataDefs::GUI_Scale = "GUI/Scale";
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 const char* UIExtraDataDefs::GUI_Fullscreen_LegacyMode = "GUI/Fullscreen/LegacyMode";
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 const char* UIExtraDataDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
 const char* UIExtraDataDefs::GUI_LastVisibilityStatusForGuestScreen = "GUI/LastVisibilityStatusForGuestScreen";
@@ -126,17 +126,17 @@
 const char* UIExtraDataDefs::GUI_HiDPI_UnscaledOutput = "GUI/HiDPI/UnscaledOutput";
 const char* UIExtraDataDefs::GUI_HiDPI_Optimization = "GUI/HiDPI/Optimization";
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 const char* UIExtraDataDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
 const char* UIExtraDataDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide";
 const char* UIExtraDataDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 const char* UIExtraDataDefs::GUI_StatusBar_Enabled = "GUI/StatusBar/Enabled";
 const char* UIExtraDataDefs::GUI_RestrictedStatusBarIndicators = "GUI/RestrictedStatusBarIndicators";
 const char* UIExtraDataDefs::GUI_StatusBar_IndicatorOrder = "GUI/StatusBar/IndicatorOrder";
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
 const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
 const char* UIExtraDataDefs::GUI_DockIconDisableOverlay = "GUI/DockIconDisableOverlay";
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 const char* UIExtraDataDefs::GUI_PassCAD = "GUI/PassCAD";
 const char* UIExtraDataDefs::GUI_MouseCapturePolicy = "GUI/MouseCapturePolicy";
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 60362)
@@ -140,10 +140,10 @@
         /** Holds whether this machine is first time started. */
         extern const char* GUI_FirstRun;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /** Except Mac OS X: Holds redefined machine-window icon names. */
         extern const char* GUI_MachineWindowIcons;
         /** Except Mac OS X: Holds redefined machine-window name postfix. */
         extern const char* GUI_MachineWindowNamePostfix;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /** Prefix used by composite extra-data keys,
           * which holds normal machine-window geometry per screen-index. */
@@ -154,8 +154,8 @@
         /** Holds machine-window geometry maximized state flag. */
         extern const char* GUI_Geometry_State_Max;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /** Holds Runtime UI menu-bar availability status. */
         extern const char* GUI_MenuBar_Enabled;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /** Holds restricted Runtime UI menu types. */
         extern const char* GUI_RestrictedRuntimeMenus;
@@ -174,8 +174,8 @@
         extern const char* GUI_RestrictedRuntimeDebuggerMenuActions;
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /** Mac OS X: Holds restricted Runtime UI action types for 'Window' menu. */
         extern const char* GUI_RestrictedRuntimeWindowMenuActions;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         /** Holds restricted Runtime UI action types for Help menu. */
         extern const char* GUI_RestrictedRuntimeHelpMenuActions;
@@ -188,8 +188,8 @@
         /** Holds whether scaled visual-state is requested. */
         extern const char* GUI_Scale;
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         /** Holds whether legacy full-screen mode is requested. */
         extern const char* GUI_Fullscreen_LegacyMode;
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
         /** Holds whether guest-screen auto-resize according machine-window size is enabled. */
         extern const char* GUI_AutoresizeGuest;
@@ -221,5 +221,5 @@
         /** Holds Runtime UI HiDPI optimization type. */
         extern const char* GUI_HiDPI_Optimization;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /** Holds whether mini-toolbar is enabled for full and seamless screens. */
         extern const char* GUI_ShowMiniToolBar;
@@ -228,5 +228,5 @@
         /** Holds mini-toolbar alignment. */
         extern const char* GUI_MiniToolBarAlignment;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /** Holds Runtime UI status-bar availability status. */
         extern const char* GUI_StatusBar_Enabled;
@@ -235,5 +235,5 @@
         /** Holds Runtime UI status-bar indicator order. */
         extern const char* GUI_StatusBar_IndicatorOrder;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /** Mac OS X: Holds whether Dock icon should be updated at runtime. */
         extern const char* GUI_RealtimeDockIconUpdateEnabled;
@@ -242,5 +242,5 @@
         /** Mac OS X: Holds whether Dock icon should have overlay disabled. */
         extern const char* GUI_DockIconDisableOverlay;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         /** Holds whether machine should pass CAD to guest. */
         extern const char* GUI_PassCAD;
@@ -426,7 +426,7 @@
         RuntimeMenuInputActionType_KeyboardSettings  = RT_BIT(1),
         RuntimeMenuInputActionType_TypeCAD           = RT_BIT(2),
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         RuntimeMenuInputActionType_TypeCABS          = RT_BIT(3),
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
         RuntimeMenuInputActionType_TypeCtrlBreak     = RT_BIT(4),
         RuntimeMenuInputActionType_TypeInsert        = RT_BIT(5),
@@ -662,5 +662,5 @@
 };
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 /** Runtime UI: Mini-toolbar alignment. */
 enum MiniToolbarAlignment
@@ -669,5 +669,5 @@
     MiniToolbarAlignment_Top
 };
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 /** Runtime UI: Information-element types. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 60362)
@@ -1340,9 +1340,9 @@
 void UIExtraDataManagerWindow::prepareThis()
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Apply window icons: */
     setWindowIcon(UIIconPool::iconSetFull(":/edataman_32px.png",
                                           ":/edataman_16px.png"));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Apply window title: */
@@ -1428,13 +1428,13 @@
                          m_pMainLayout == centralWidget()->layout());
         {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             /* No spacing/margins on the Mac: */
             m_pMainLayout->setContentsMargins(0, 0, 0, 0);
             m_pMainLayout->insertSpacing(0, 10);
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
             /* Set spacing/margin like in the selector window: */
             m_pMainLayout->setSpacing(5);
             m_pMainLayout->setContentsMargins(5, 5, 5, 5);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             /* Prepare tool-bar: */
             prepareToolBar();
@@ -1466,12 +1466,12 @@
         m_pToolBar->addAction(m_pActionSave);
         /* Integrate tool-bar into dialog: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Enable unified tool-bars on Mac OS X. Available on Qt >= 4.3: */
         addToolBar(m_pToolBar);
         m_pToolBar->enableMacToolbar();
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
         /* Add tool-bar into main-layout: */
         m_pMainLayout->addWidget(m_pToolBar);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 }
@@ -1674,10 +1674,10 @@
         /* Load geometry: */
         m_geometry = gEDataManager->extraDataManagerGeometry(this);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         move(m_geometry.topLeft());
         resize(m_geometry.size());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         setGeometry(m_geometry);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIExtraDataManagerWindow: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
@@ -1704,9 +1704,9 @@
     {
         /* Save geometry: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         gEDataManager->setExtraDataManagerGeometry(m_geometry, ::darwinIsWindowMaximized(this));
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         gEDataManager->setExtraDataManagerGeometry(m_geometry, isMaximized());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIExtraDataManagerWindow: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
@@ -1742,10 +1742,10 @@
             if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
             {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                 QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
                 m_geometry.moveTo(pMoveEvent->pos());
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
                 m_geometry.moveTo(geometry().x(), geometry().y());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             }
             break;
@@ -1957,7 +1957,7 @@
            << GUI_PreventReconfiguration << GUI_PreventSnapshotOperations
            << GUI_FirstRun
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
            << GUI_MachineWindowIcons << GUI_MachineWindowNamePostfix
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
            << GUI_LastNormalWindowPosition << GUI_LastScaleWindowPosition
            << GUI_RestrictedRuntimeMenus
@@ -1970,13 +1970,13 @@
            << GUI_RestrictedRuntimeDebuggerMenuActions
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
            << GUI_RestrictedRuntimeWindowMenuActions
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
            << GUI_RestrictedRuntimeHelpMenuActions
            << GUI_RestrictedVisualStates
            << GUI_Fullscreen << GUI_Seamless << GUI_Scale
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
            << GUI_Fullscreen_LegacyMode
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
            << GUI_AutoresizeGuest << GUI_LastVisibilityStatusForGuestScreen << GUI_LastGuestSizeHint
            << GUI_VirtualScreenToHostScreen << GUI_AutomountGuestScreens
@@ -1988,11 +1988,11 @@
            << GUI_HiDPI_UnscaledOutput
            << GUI_HiDPI_Optimization
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
            << GUI_ShowMiniToolBar << GUI_MiniToolBarAutoHide << GUI_MiniToolBarAlignment
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
            << GUI_StatusBar_Enabled << GUI_RestrictedStatusBarIndicators << GUI_StatusBar_IndicatorOrder
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
            << GUI_RealtimeDockIconUpdateEnabled << GUI_RealtimeDockIconUpdateMonitor << GUI_DockIconDisableOverlay
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
            << GUI_PassCAD
            << GUI_MouseCapturePolicy
@@ -2481,9 +2481,9 @@
 
     /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
     if (fOk && !availableGeometry.contains(geometry))
         geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* As final fallback, move default-geometry to available-geometry' center: */
@@ -2712,5 +2712,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 QStringList UIExtraDataManager::machineWindowIconNames(const QString &strID)
 {
@@ -2722,5 +2722,5 @@
     return extraDataString(GUI_MachineWindowNamePostfix, strID);
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 QRect UIExtraDataManager::machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strID)
@@ -2800,5 +2800,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 bool UIExtraDataManager::menuBarEnabled(const QString &strID)
 {
@@ -2812,5 +2812,5 @@
     setExtraDataString(GUI_MenuBar_Enabled, toFeatureRestricted(!fEnabled), strID);
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 UIExtraDataMetaDefs::MenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QString &strID)
@@ -3176,5 +3176,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 UIExtraDataMetaDefs::MenuWindowActionType UIExtraDataManager::restrictedRuntimeMenuWindowActionTypes(const QString &strID)
 {
@@ -3223,5 +3223,5 @@
     setExtraDataStringList(GUI_RestrictedRuntimeWindowMenuActions, result, strID);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 UIExtraDataMetaDefs::MenuHelpActionType UIExtraDataManager::restrictedRuntimeMenuHelpActionTypes(const QString &strID)
@@ -3302,5 +3302,5 @@
 }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 bool UIExtraDataManager::legacyFullscreenModeRequested()
 {
@@ -3308,5 +3308,5 @@
     return isFeatureAllowed(GUI_Fullscreen_LegacyMode);
 }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 bool UIExtraDataManager::guestScreenAutoResizeEnabled(const QString &strID)
@@ -3462,5 +3462,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 bool UIExtraDataManager::miniToolbarEnabled(const QString &strID)
 {
@@ -3508,5 +3508,5 @@
     setExtraDataString(GUI_MiniToolBarAlignment, QString(), strID);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 bool UIExtraDataManager::statusBarEnabled(const QString &strID)
@@ -3574,5 +3574,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 bool UIExtraDataManager::realtimeDockIconUpdateEnabled(const QString &strID)
 {
@@ -3608,5 +3608,5 @@
     setExtraDataString(GUI_DockIconDisableOverlay, toFeatureAllowed(fDisabled), strID);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 bool UIExtraDataManager::passCADtoGuest(const QString &strID)
@@ -3693,9 +3693,9 @@
 
     /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
     if (fOk && !availableGeometry.contains(geometry))
         geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* As a fallback, move default-geometry to pParentWidget' geometry center: */
@@ -3852,9 +3852,9 @@
 
     /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Make sure resulting geometry is within current bounds: */
     if (fOk && !availableGeometry.contains(geometry))
         geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* As final fallback, move default-geometry to available-geometry' center: */
@@ -3965,5 +3965,5 @@
 
     /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Get available-geometry [of screen with point (iX, iY) if possible]: */
     const QRect availableGeometry = fOk ? vboxGlobal().availableGeometry(QPoint(iX, iY)) :
@@ -3973,5 +3973,5 @@
     if (!availableGeometry.contains(geometry))
         geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* Return result: */
@@ -4040,5 +4040,5 @@
             if (strKey == GUI_HidLedsSync)
                 emit sigHidLedsSyncStateChange(!isFeatureRestricted(strKey, strMachineID));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             /* 'Dock icon' appearance changed (allowed if not restricted)? */
             else if (strKey == GUI_RealtimeDockIconUpdateEnabled ||
@@ -4048,12 +4048,12 @@
             else if (strKey == GUI_DockIconDisableOverlay)
                 emit sigDockIconOverlayAppearanceChange(isFeatureAllowed(strKey, strMachineID));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         }
 
         /* Menu-bar configuration change: */
         if (
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
             strKey == GUI_MenuBar_Enabled ||
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             strKey == GUI_RestrictedRuntimeMenus ||
             strKey == GUI_RestrictedRuntimeApplicationMenuActions ||
@@ -4065,7 +4065,7 @@
             strKey == GUI_RestrictedRuntimeDebuggerMenuActions ||
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             strKey == GUI_RestrictedRuntimeWindowMenuActions ||
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
             strKey == GUI_RestrictedRuntimeHelpMenuActions)
             emit sigMenuBarConfigurationChange(strMachineID);
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 60362)
@@ -298,10 +298,10 @@
         void setMachineFirstTimeStarted(bool fFirstTimeStarted, const QString &strID);
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /** Except Mac OS X: Returns redefined machine-window icon names. */
         QStringList machineWindowIconNames(const QString &strID);
         /** Except Mac OS X: Returns redefined machine-window name postfix. */
         QString machineWindowNamePostfix(const QString &strID);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
         /** Returns geometry for machine-window with @a uScreenIndex in @a visualStateType. */
@@ -312,10 +312,10 @@
         void setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QString &strID);
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /** Returns whether Runtime UI menu-bar is enabled. */
         bool menuBarEnabled(const QString &strID);
         /** Defines whether Runtime UI menu-bar is @a fEnabled. */
         void setMenuBarEnabled(bool fEnabled, const QString &strID);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
         /** Returns restricted Runtime UI menu types. */
@@ -356,10 +356,10 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /** Mac OS X: Returns restricted Runtime UI action types for Window menu. */
         UIExtraDataMetaDefs::MenuWindowActionType restrictedRuntimeMenuWindowActionTypes(const QString &strID);
         /** Mac OS X: Defines restricted Runtime UI action types for Window menu. */
         void setRestrictedRuntimeMenuWindowActionTypes(UIExtraDataMetaDefs::MenuWindowActionType types, const QString &strID);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
         /** Returns restricted Runtime UI action types for Help menu. */
@@ -376,8 +376,8 @@
         void setRequestedVisualState(UIVisualStateType visualState, const QString &strID);
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         /** Returns whether legacy full-screen mode is requested. */
         bool legacyFullscreenModeRequested();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
         /** Returns whether guest-screen auto-resize according machine-window size is enabled. */
@@ -425,5 +425,5 @@
         HiDPIOptimizationType hiDPIOptimizationType(const QString &strID);
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /** Returns whether mini-toolbar is enabled for full and seamless screens. */
         bool miniToolbarEnabled(const QString &strID);
@@ -440,5 +440,5 @@
         /** Returns mini-toolbar @a alignment. */
         void setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QString &strID);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
         /** Returns whether Runtime UI status-bar is enabled. */
@@ -457,5 +457,5 @@
         void setStatusBarIndicatorOrder(const QList<IndicatorType> &list, const QString &strID);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /** Mac OS X: Returns whether Dock icon should be updated at runtime. */
         bool realtimeDockIconUpdateEnabled(const QString &strID);
@@ -472,5 +472,5 @@
         /** Mac OS X: Defines whether Dock icon overlay is @a fDisabled. */
         void setDockIconDisableOverlay(bool fDisabled, const QString &strID);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
         /** Returns whether machine should pass CAD to guest. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 60362)
@@ -66,8 +66,8 @@
 UIMenu::UIMenu()
     : m_fShowToolTip(false)
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     , m_fConsumable(false)
     , m_fConsumed(false)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 {
 }
@@ -926,5 +926,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 bool UIActionPool::isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType type) const
 {
@@ -940,5 +940,5 @@
     m_invalidations << UIActionIndex_M_Window;
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 bool UIActionPool::isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType type) const
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 60362)
@@ -108,5 +108,5 @@
     void setShowToolTip(bool fShowToolTips) { m_fShowToolTip = fShowToolTips; }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Returns whether this menu is consumable by the menu-bar. */
     bool isConsumable() const { return m_fConsumable; }
@@ -118,5 +118,5 @@
     /** Mac OS X: Defines whether this menu is @a fConsumed by the menu-bar. */
     void setConsumed(bool fConsumed) { m_fConsumed = fConsumed; }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 protected:
@@ -130,10 +130,10 @@
     bool m_fShowToolTip;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Holds whether this menu can be consumed by the menu-bar. */
     bool m_fConsumable;
     /** Mac OS X: Holds whether this menu is consumed by the menu-bar. */
     bool m_fConsumed;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 };
 
@@ -430,10 +430,10 @@
     void setRestrictionForMenuApplication(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuApplicationActionType restriction);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Returns whether the action with passed @a type is allowed in the 'Window' menu. */
     bool isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType type) const;
     /** Mac OS X: Defines 'Window' menu @a restriction for passed @a level. */
     void setRestrictionForMenuWindow(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuWindowActionType restriction);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** Returns whether the action with passed @a type is allowed in the 'Help' menu. */
@@ -523,8 +523,8 @@
     /** Holds restricted action types of the 'Application' menu. */
     QMap<UIActionRestrictionLevel, UIExtraDataMetaDefs::MenuApplicationActionType> m_restrictedActionsMenuApplication;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Holds restricted action types of the 'Window' menu. */
     QMap<UIActionRestrictionLevel, UIExtraDataMetaDefs::MenuWindowActionType> m_restrictedActionsMenuWindow;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** Holds restricted action types of the Help menu. */
     QMap<UIActionRestrictionLevel, UIExtraDataMetaDefs::MenuHelpActionType> m_restrictedActionsMenuHelp;
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 60362)
@@ -59,11 +59,11 @@
         , SetRegionEventType
         , ModifierKeyChangeEventType
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
         , ShellExecuteEventType
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
         , ActivateActionEventType
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         , ShowWindowEventType
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         , AddVDMUrlsEventType
 #ifdef VBOX_GUI_USE_QGL
@@ -90,5 +90,5 @@
 using namespace UIDefs /* if header included */;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 /** Mac OS X: Known OS releases. */
 enum MacOSXRelease
@@ -103,5 +103,5 @@
     MacOSXRelease_New,
 };
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /** Common UI: Size suffixes. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp	(revision 60362)
@@ -64,12 +64,12 @@
     /* Apply visual and mouse-event mask for that 1 pixel: */
     setMask(QRect(0, 0, 1, 1));
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* For composite WMs make this 1 pixel transparent: */
     if (vboxGlobal().isCompositingManagerRunning())
         setAttribute(Qt::WA_TranslucentBackground);
-#else /* !Q_WS_X11 */
+#else /* !VBOX_WS_X11 */
     /* Make this 1 pixel transparent: */
     setAttribute(Qt::WA_TranslucentBackground);
-#endif /* !Q_WS_X11 */
+#endif /* !VBOX_WS_X11 */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 60362)
@@ -175,12 +175,12 @@
         case UIDefaultIconType_MessageBoxWarning:
         {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             /* At least in Qt 4.3.4/4.4 RC1 SP_MessageBoxWarning is the application
              * icon. So change this to the critical icon. (Maybe this would be
              * fixed in a later Qt version) */
             icon = pStyle->standardIcon(QStyle::SP_MessageBoxCritical, 0, pWidget);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             icon = pStyle->standardIcon(QStyle::SP_MessageBoxWarning, 0, pWidget);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             break;
         }
@@ -238,5 +238,5 @@
     icon.addPixmap(pixmap, mode, state);
 
-#ifdef Q_WS_MAC
+#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
@@ -248,5 +248,5 @@
     return;
 # endif /* !VBOX_GUI_WITH_HIDPI */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Parse name to prefix and suffix: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 60362)
@@ -26,7 +26,7 @@
 # include <QThread>
 # include <QProcess>
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <QPushButton>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -49,10 +49,10 @@
 # include "VBoxAboutDlg.h"
 # include "UIHostComboEditor.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils-darwin.h"
-# endif /* Q_WS_MAC */
-# ifdef Q_WS_WIN
+# endif /* VBOX_WS_MAC */
+# ifdef VBOX_WS_WIN
 #  include <Htmlhelp.h>
-# endif /* Q_WS_WIN */
+# endif /* VBOX_WS_WIN */
 
 /* COM includes: */
@@ -2504,5 +2504,5 @@
         errMsg = msg->pszDefine;
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     PCRTWINERRMSG winMsg = NULL;
 
@@ -2515,5 +2515,5 @@
             errMsg = winMsg->pszDefine;
     }
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     if (errMsg != NULL && *errMsg != '\0')
@@ -2540,5 +2540,5 @@
         errMsg = msg->pszDefine;
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     PCRTWINERRMSG winMsg = NULL;
 
@@ -2551,5 +2551,5 @@
             errMsg = winMsg->pszDefine;
     }
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     if (errMsg != NULL && *errMsg != '\0')
@@ -2675,7 +2675,7 @@
 void UIMessageCenter::sltShowUserManual(const QString &strLocation)
 {
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
     HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
 # ifndef VBOX_OSE
     char szViewerPath[RTPATH_MAX];
@@ -2687,5 +2687,5 @@
     vboxGlobal().openURL("file://" + strLocation);
 # endif /* #ifdef VBOX_OSE */
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
     vboxGlobal().openURL("file://" + strLocation);
 #endif
@@ -2784,9 +2784,9 @@
     if (info.isBasicAvailable())
     {
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
         haveResultCode = info.isFullAvailable();
         bool haveComponent = true;
         bool haveInterfaceID = true;
-#else /* defined (Q_WS_WIN) */
+#else /* defined (VBOX_WS_WIN) */
         haveResultCode = true;
         bool haveComponent = info.isFullAvailable();
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 60362)
@@ -38,12 +38,12 @@
 # include <QLocale>
 # include <QSpinBox>
-# ifdef Q_WS_WIN
+# ifdef VBOX_WS_WIN
 #  include <QEventLoop>
-# endif /* Q_WS_WIN */
-# ifdef Q_WS_X11
+# endif /* VBOX_WS_WIN */
+# ifdef VBOX_WS_X11
 #  include <QTextBrowser>
 #  include <QScrollBar>
 #  include <QX11Info>
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 # ifdef VBOX_GUI_WITH_PIDFILE
 #  include <QTextStream>
@@ -74,5 +74,5 @@
 # include "UIIconPool.h"
 # include "UIVirtualBoxEventHandler.h"
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
 #  include "UIHostComboEditor.h"
 #  include "UIDesktopWidgetWatchdog.h"
@@ -80,10 +80,10 @@
 #   include "VBoxLicenseViewer.h"
 #  endif /* VBOX_OSE */
-# endif /* Q_WS_X11 */
-# ifdef Q_WS_MAC
+# endif /* VBOX_WS_X11 */
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils-darwin.h"
 #  include "UIMachineWindowFullscreen.h"
 #  include "UIMachineWindowSeamless.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 # ifdef VBOX_WITH_VIDEOHWACCEL
 #  include "VBoxFBOverlay.h"
@@ -120,14 +120,14 @@
 # include <iprt/system.h>
 # include <iprt/stream.h>
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
 #  include <iprt/mem.h>
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 # include <VBox/sup.h>
 # include <VBox/com/Guid.h>
 
 /* External includes: */
-# ifdef Q_WS_WIN
+# ifdef VBOX_WS_WIN
 #  include "shlobj.h"
-# endif /* Q_WS_WIN */
+# endif /* VBOX_WS_WIN */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -155,8 +155,8 @@
 /* External includes: */
 # include <math.h>
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <sys/utsname.h>
-#endif /* Q_WS_MAC */
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_MAC */
+#ifdef VBOX_WS_X11
 # undef BOOL /* typedef CARD8 BOOL in Xmd.h conflicts with #define BOOL PRBool
               * in COMDefs.h. A better fix would be to isolate X11-specific
@@ -168,5 +168,5 @@
 # include <X11/extensions/Xinerama.h>
 # define BOOL PRBool
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -223,16 +223,16 @@
 VBoxGlobal::VBoxGlobal()
     : mValid (false)
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     , m_osRelease(MacOSXRelease_Old)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     , m_fWrappersValid(false)
     , m_fVBoxSVCAvailable(true)
     , m_fSeparateProcess(false)
     , m_pMediumEnumerator(0)
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     , m_fCompositingManagerRunning(false)
     , m_enmWindowManagerType(X11WMType_Unknown)
     , m_pDesktopWidgetWatchdog(0)
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 #if defined(DEBUG_bird)
     , mAgressiveCaching(false)
@@ -308,5 +308,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 /* static */
 MacOSXRelease VBoxGlobal::determineOsRelease()
@@ -334,5 +334,5 @@
     return MacOSXRelease_Old;
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 int VBoxGlobal::screenCount() const
@@ -356,10 +356,10 @@
 const QRect VBoxGlobal::screenGeometry(int iHostScreenIndex /* = -1 */) const
 {
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Make sure desktop-widget watchdog already created: */
     AssertPtrReturn(m_pDesktopWidgetWatchdog, QApplication::desktop()->screenGeometry(iHostScreenIndex));
     /* Redirect call to UIDesktopWidgetWatchdog: */
     return m_pDesktopWidgetWatchdog->screenGeometry(iHostScreenIndex);
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Redirect call to QDesktopWidget: */
@@ -369,10 +369,10 @@
 const QRect VBoxGlobal::availableGeometry(int iHostScreenIndex /* = -1 */) const
 {
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Make sure desktop-widget watchdog already created: */
     AssertPtrReturn(m_pDesktopWidgetWatchdog, QApplication::desktop()->availableGeometry(iHostScreenIndex));
     /* Redirect call to UIDesktopWidgetWatchdog: */
     return m_pDesktopWidgetWatchdog->availableGeometry(iHostScreenIndex);
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Redirect call to QDesktopWidget: */
@@ -501,5 +501,5 @@
 }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 QList<QRect> XGetDesktopList()
 {
@@ -616,5 +616,5 @@
     return result;
 }
-#endif /* ifdef Q_WS_X11 */
+#endif /* ifdef VBOX_WS_X11 */
 
 /**
@@ -2200,9 +2200,9 @@
         startMediumEnumeration();
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* As X11 do not have functionality for providing human readable key names,
      * we keep a table of them, which must be updated when the language is changed. */
     UINativeHotKey::retranslateKeyNames();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 }
 
@@ -2413,20 +2413,20 @@
     if (fResetToC)
         sLoadedLangId = "C";
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Qt doesn't translate the items in the Application menu initially.
      * Manually trigger an update. */
     ::darwinRetranslateAppMenu();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
 QString VBoxGlobal::helpFile() const
 {
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
     const QString name = "VirtualBox";
     const QString suffix = "chm";
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
     const QString name = "UserManual";
     const QString suffix = "pdf";
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
 # if defined VBOX_OSE
     const QString name = "UserManual";
@@ -2725,5 +2725,5 @@
     /* ensure the widget is within the available desktop area */
     QRect newGeo = normalizeGeometry (geo, deskGeo, aCanResize);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* No idea why, but Qt doesn't respect if there is a unified toolbar on the
      * ::move call. So manually add the height of the toolbar before setting
@@ -2731,5 +2731,5 @@
     if (w)
         newGeo.translate (0, ::darwinWindowToolBarHeight (aWidget));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     aWidget->move (newGeo.topLeft());
@@ -3151,5 +3151,5 @@
 QString VBoxGlobal::systemLanguageId()
 {
-#if defined (Q_WS_MAC)
+#if defined (VBOX_WS_MAC)
     /* QLocale return the right id only if the user select the format of the
      * language also. So we use our own implementation */
@@ -3167,5 +3167,5 @@
 }
 
-#if defined (Q_WS_X11)
+#if defined (VBOX_WS_X11)
 
 static char *XXGetProperty (Display *aDpy, Window aWnd,
@@ -3242,5 +3242,5 @@
     bool result = true;
 
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
 
     HWND handle = (HWND)aWId;
@@ -3253,5 +3253,5 @@
     result &= !!SetForegroundWindow (handle);
 
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
 
     Display *dpy = QX11Info::display();
@@ -3307,5 +3307,5 @@
 }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 /* This method tests whether the current X11 window manager supports full-screen mode as we need it.
  * Unfortunately the EWMH specification was not fully clear about whether we can expect to find
@@ -3459,5 +3459,5 @@
     }
 }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /**
@@ -3501,5 +3501,5 @@
 QString VBoxGlobal::insertKeyToActionText(const QString &strText, const QString &strKey)
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     QString pattern("%1 (Host+%2)");
 #else
@@ -3933,9 +3933,9 @@
         if (args.at(i).startsWith("-"))
             break;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         QString strArg = ::darwinResolveAlias(args.at(i));
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         QString strArg = args.at(i);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         if (   !strArg.isEmpty()
             && QFile::exists(strArg))
@@ -3975,8 +3975,8 @@
     connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(cleanup()));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Determine OS release early: */
     m_osRelease = determineOsRelease();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Create message-center: */
@@ -4056,5 +4056,5 @@
     UIVisualStateType visualStateType = UIVisualStateType_Invalid;
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Check whether we have compositing manager running: */
     m_fCompositingManagerRunning = X11IsCompositingManagerRunning();
@@ -4065,5 +4065,5 @@
     /* Create desktop-widget watchdog instance: */
     m_pDesktopWidgetWatchdog = new UIDesktopWidgetWatchdog(this);
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -4706,5 +4706,5 @@
 bool VBoxGlobal::switchToMachine(CMachine &machine)
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     ULONG64 id = machine.ShowConsoleWindow();
 #else
@@ -4720,9 +4720,9 @@
         return true;
 
-#if defined (Q_WS_WIN) || defined (Q_WS_X11)
+#if defined (VBOX_WS_WIN) || defined (VBOX_WS_X11)
 
     return vboxGlobal().activateWindow(id, true);
 
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
     /*
      * This is just for the case were the other process cannot steal
@@ -4751,5 +4751,5 @@
         return false;
 
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
 
     HWND hwnd = mWinId;
@@ -4787,9 +4787,9 @@
     return true;
 
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
 
     return false;
 
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
 
     ProcessSerialNumber psn;
@@ -4849,5 +4849,5 @@
     AllowSetForegroundWindow(ASFW_ANY);
 #endif /* Q_OS_WIN */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Make sure VM process will start on the same display as the VM selector: */
     const char *pDisplay = RTEnvGet("DISPLAY");
@@ -4857,5 +4857,5 @@
     if (pXauth)
         strEnv.append(QString("XAUTHORITY=%1\n").arg(pXauth));
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     QString strType;
     switch (enmLaunchMode)
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h	(revision 60362)
@@ -27,7 +27,7 @@
 #include <QFileIconProvider>
 #include <QReadWriteLock>
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <QSet>
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -35,7 +35,7 @@
 #include "UIMediumDefs.h"
 #include "VBoxGlobalSettings.h"
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # include "VBoxX11Helper.h"
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* COM includes: */
@@ -48,7 +48,7 @@
 
 /* Other includes: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # include <X11/Xdefs.h>
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* Forward declarations: */
@@ -66,7 +66,7 @@
 class UIIconPoolGeneral;
 class UIThreadPool;
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 class UIDesktopWidgetWatchdog;
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 // VBoxGlobal class
@@ -119,10 +119,10 @@
     bool isSeparateProcess() const { return m_fSeparateProcess; }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Returns #MacOSXRelease determined using <i>uname</i> call. */
     static MacOSXRelease determineOsRelease();
     /** Mac OS X: Returns #MacOSXRelease determined during VBoxGlobal prepare routine. */
     MacOSXRelease osRelease() const { return m_osRelease; }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** Try to acquire COM cleanup protection token for reading. */
@@ -203,10 +203,10 @@
     QList<QUrl> &argUrlList() { return m_ArgUrlList; }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /** X11: Returns whether the Window Manager we are running at is composition one. */
     bool isCompositingManagerRunning() const { return m_fCompositingManagerRunning; }
     /** X11: Returns the type of the Window Manager we are running under. */
     X11WMType typeOfWindowManager() const { return m_enmWindowManagerType; }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /** Returns whether we should restore current snapshot before VM started. */
@@ -417,5 +417,5 @@
     static bool activateWindow (WId aWId, bool aSwitchDesktop = true);
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /** X11: Test whether the current window manager supports full screen mode. */
     static bool supportsFullScreenMonitorsProtocolX11();
@@ -429,5 +429,5 @@
     /** X11: Sets _NET_WM_STATE_FULLSCREEN flag for passed @a pWidget. */
     static void setFullScreenFlag(QWidget *pWidget);
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     static QString removeAccelMark (const QString &aText);
@@ -528,8 +528,8 @@
     bool mValid;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Holds the #MacOSXRelease determined using <i>uname</i> call. */
     MacOSXRelease m_osRelease;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** COM cleanup protection token. */
@@ -569,5 +569,5 @@
     mutable QReadWriteLock m_mediumEnumeratorDtorRwLock;
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /** X11: Holds whether the Window Manager we are running at is composition one. */
     bool m_fCompositingManagerRunning;
@@ -580,5 +580,5 @@
         UIDesktopWidgetWatchdog *m_pDesktopWidgetWatchdog;
     /** @} */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /** The --aggressive-caching / --no-aggressive-caching option. */
@@ -630,5 +630,5 @@
 #endif
 
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
     DWORD dwHTMLHelpCookie;
 #endif
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h	(revision 60362)
@@ -276,7 +276,7 @@
 };
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 #endif // !___VBoxUtils_h___
Index: trunk/src/VBox/Frontends/VirtualBox/src/main.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/main.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/main.cpp	(revision 60362)
@@ -28,8 +28,8 @@
 # include "UISelectorWindow.h"
 # include "UIModalWindowManager.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils.h"
 #  include "UICocoaApplication.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* Other VBox includes: */
@@ -41,16 +41,16 @@
 # else /* !VBOX_WITH_HARDENING */
 #  include <iprt/initterm.h>
-#  ifdef Q_WS_MAC
+#  ifdef VBOX_WS_MAC
 #   include <iprt/asm.h>
-#  endif /* Q_WS_MAC */
+#  endif /* VBOX_WS_MAC */
 # endif /* !VBOX_WITH_HARDENING */
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
 #  include <iprt/env.h>
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 /* Qt includes: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # ifdef Q_OS_SOLARIS
 #  include <QPlastiqueStyle>
@@ -59,5 +59,5 @@
 #  include <QFontDatabase>
 # endif /* !Q_OS_SOLARIS */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* Other VBox includes: */
@@ -69,9 +69,9 @@
 
 /* Other includes: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <dlfcn.h>
 # include <sys/mman.h>
-#endif /* Q_WS_MAC */
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_MAC */
+#ifdef VBOX_WS_X11
 # include <dlfcn.h>
 # include <unistd.h>
@@ -90,5 +90,5 @@
 #  endif /* !RT_ARCH_AMD64 */
 # endif /* RT_OS_LINUX && DEBUG */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -133,5 +133,5 @@
 
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 /**
  * Mac OS X: Really ugly hack to bypass a set-uid check in AppKit.
@@ -151,7 +151,7 @@
         ASMAtomicWriteU32((volatile uint32_t *)pvAddr, 0xccc3c031); /* xor eax, eax; ret; int3 */
 }
-#endif /* Q_WS_MAC */
-
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_MAC */
+
+#ifdef VBOX_WS_X11
 /** X11: For versions of Xlib which are aware of multi-threaded environments this function
   *      calls for XInitThreads() which initializes Xlib support for concurrent threads.
@@ -224,5 +224,5 @@
 }
 # endif /* RT_OS_LINUX && DEBUG */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 #if QT_VERSION >= 0x050000
@@ -235,7 +235,7 @@
 {
     NOREF(context);
-# ifndef Q_WS_X11
+# ifndef VBOX_WS_X11
     NOREF(strMessage);
-# endif /* !Q_WS_X11 */
+# endif /* !VBOX_WS_X11 */
     switch (type)
     {
@@ -245,22 +245,22 @@
         case QtWarningMsg:
             Log(("Qt WARNING: %s\n", strMessage.toUtf8().constData()));
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
             /* Needed for instance for the message ``cannot connect to X server'': */
             RTStrmPrintf(g_pStdErr, "Qt WARNING: %s\n", strMessage.toUtf8().constData());
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
             break;
         case QtCriticalMsg:
             Log(("Qt CRITICAL: %s\n", strMessage.toUtf8().constData()));
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
             /* Needed for instance for the message ``cannot connect to X server'': */
             RTStrmPrintf(g_pStdErr, "Qt CRITICAL: %s\n", strMessage.toUtf8().constData());
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
             break;
         case QtFatalMsg:
             Log(("Qt FATAL: %s\n", strMessage.toUtf8().constData()));
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
             /* Needed for instance for the message ``cannot connect to X server'': */
             RTStrmPrintf(g_pStdErr, "Qt FATAL: %s\n", strMessage.toUtf8().constData());
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
     }
 }
@@ -272,7 +272,7 @@
 static void QtMessageOutput(QtMsgType type, const char *pMsg)
 {
-# ifndef Q_WS_X11
+# ifndef VBOX_WS_X11
     NOREF(pMsg);
-# endif /* !Q_WS_X11 */
+# endif /* !VBOX_WS_X11 */
     switch (type)
     {
@@ -282,22 +282,22 @@
         case QtWarningMsg:
             Log(("Qt WARNING: %s\n", pMsg));
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
             /* Needed for instance for the message ``cannot connect to X server'': */
             RTStrmPrintf(g_pStdErr, "Qt WARNING: %s\n", pMsg);
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
             break;
         case QtCriticalMsg:
             Log(("Qt CRITICAL: %s\n", pMsg));
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
             /* Needed for instance for the message ``cannot connect to X server'': */
             RTStrmPrintf(g_pStdErr, "Qt CRITICAL: %s\n", pMsg);
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
             break;
         case QtFatalMsg:
             Log(("Qt FATAL: %s\n", pMsg));
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
             /* Needed for instance for the message ``cannot connect to X server'': */
             RTStrmPrintf(g_pStdErr, "Qt FATAL: %s\n", pMsg);
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
     }
 }
@@ -371,14 +371,14 @@
     do
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Hide setuid root from AppKit: */
         HideSetUidRootFromAppKit();
-#endif /* Q_WS_MAC */
-
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_MAC */
+
+#ifdef VBOX_WS_X11
         /* Make sure multi-threaded environment is safe: */
         if (!MakeSureMultiThreadingIsSafe())
             break;
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
         /* Console help preprocessing: */
@@ -407,5 +407,5 @@
 #endif /* VBOX_WITH_HARDENING */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Apply font fixes (before QApplication get created and instantiated font-hints): */
         switch (VBoxGlobal::determineOsRelease())
@@ -419,12 +419,12 @@
         /* Instantiate own NSApplication before QApplication do it for us: */
         UICocoaApplication::instance();
-#endif /* Q_WS_MAC */
-
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_MAC */
+
+#ifdef VBOX_WS_X11
 # if defined(RT_OS_LINUX) && defined(DEBUG)
         /* Install signal handler to backtrace the call stack: */
         InstallSignalHandler();
 # endif /* RT_OS_LINUX && DEBUG */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 #if QT_VERSION >= 0x050000
@@ -439,5 +439,5 @@
         QApplication a(argc, argv);
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
         /* Drag in the sound drivers and DLLs early to get rid of the delay taking
          * place when the main menu bar (or any action from that menu bar) is
@@ -447,7 +447,7 @@
          * thread to several seconds). */
         PlaySound(NULL, NULL, 0);
-#endif /* Q_WS_WIN */
-
-#ifdef Q_WS_MAC
+#endif /* VBOX_WS_WIN */
+
+#ifdef VBOX_WS_MAC
 # ifdef VBOX_GUI_WITH_HIDPI
         /* Enable HiDPI icons.
@@ -459,7 +459,7 @@
         /* Disable menu icons on MacOS X host: */
         ::darwinDisableIconsInMenus();
-#endif /* Q_WS_MAC */
-
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_MAC */
+
+#ifdef VBOX_WS_X11
         /* Make all widget native.
          * We did it to avoid various Qt crashes while testing widget attributes or acquiring winIds.
@@ -500,5 +500,5 @@
             break;
         }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
         /* Create modal-window manager: */
@@ -554,9 +554,9 @@
 int main(int argc, char **argv, char **envp)
 {
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Make sure multi-threaded environment is safe: */
     if (!MakeSureMultiThreadingIsSafe())
         return 1;
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Initialize VBox Runtime.
@@ -662,8 +662,8 @@
 extern "C" DECLEXPORT(void) TrustedError(const char *pszWhere, SUPINITOP enmWhat, int rc, const char *pszMsgFmt, va_list va)
 {
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
     /* Hide setuid root from AppKit: */
     HideSetUidRootFromAppKit();
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
     char szMsgBuf[_16K];
@@ -749,9 +749,9 @@
     }
 
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
     /* We have to to make sure that we display the error-message
      * after the parent displayed its own message. */
     sleep(2);
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 
     /* Update strText with strDetails: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 60362)
@@ -49,7 +49,7 @@
 # include "CMediumAttachment.h"
 
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "UIWindowMenuManager.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -1087,10 +1087,10 @@
     }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Prepare 'Window' menu: */
     AssertPtrReturnVoid(gpWindowMenuManager);
     menuBar()->addMenu(gpWindowMenuManager->createMenu(this));
     gpWindowMenuManager->addWindow(this);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -1154,5 +1154,5 @@
         /* Integrate tool-bar into dialog: */
         QVBoxLayout *pMainLayout = qobject_cast<QVBoxLayout*>(centralWidget()->layout());
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Enable unified tool-bars on Mac OS X. Available on Qt >= 4.3: */
         addToolBar(m_pToolBar);
@@ -1161,5 +1161,5 @@
         pMainLayout->setContentsMargins(0, 0, 0, 0);
         pMainLayout->insertSpacing(0, 10);
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
         /* Add the tool-bar: */
         pMainLayout->insertWidget(0, m_pToolBar);
@@ -1167,5 +1167,5 @@
         pMainLayout->setSpacing(5);
         pMainLayout->setContentsMargins(5, 5, 5, 5);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 }
@@ -1395,9 +1395,9 @@
     UIMediumItem *pMediumItem = mediumItem(type);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Set the file for the proxy icon: */
     if (pMediumItem == currentMediumItem())
         setWindowFilePath(pMediumItem ? pMediumItem->location() : QString());
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Make sure current medium-item visible: */
@@ -1715,10 +1715,10 @@
 void UIMediumManager::cleanupMenuBar()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Cleanup 'Window' menu: */
     AssertPtrReturnVoid(gpWindowMenuManager);
     gpWindowMenuManager->removeWindow(this);
     gpWindowMenuManager->destroyMenu(this);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -1775,5 +1775,5 @@
 
     /* Translate tool-bar: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
        the necessary size of the toolbar is increased. Also for some languages
@@ -1782,5 +1782,5 @@
     if (m_pToolBar)
         m_pToolBar->updateLayout();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Translate tab-widget: */
@@ -1853,5 +1853,5 @@
     {
         m_pProgressBar->setText(QApplication::translate("VBoxMediaManagerDlg", "Checking accessibility"));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Make sure that the widgets aren't jumping around
          * while the progress-bar get visible. */
@@ -1860,5 +1860,5 @@
         if (m_pButtonBox)
             m_pButtonBox->setMinimumHeight(h + 12);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h	(revision 60362)
@@ -19,5 +19,5 @@
 #define ___VBoxIChatTheaterWrapper_h
 
-#if defined (Q_WS_MAC) && defined (VBOX_WITH_ICHAT_THEATER)
+#if defined (VBOX_WS_MAC) && defined (VBOX_WITH_ICHAT_THEATER)
 
 # include <ApplicationServices/ApplicationServices.h>
Index: trunk/src/VBox/Frontends/VirtualBox/src/precomp.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/precomp.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/precomp.h	(revision 60362)
@@ -102,5 +102,5 @@
 #include <QListWidget>
 #include <QLocale>
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 //# include <QMacCocoaViewContainer> - only used once / only used in Objective C++
 #endif
@@ -205,5 +205,5 @@
 #include <QWizard>
 #include <QWizardPage>
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # include <QX11Info>
 #endif
@@ -216,5 +216,5 @@
  * System specific headers.
  */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 # include <shlobj.h>
 # include <Windows.h>
@@ -669,5 +669,5 @@
 #include "VBoxUtils.h"
 #include "VBoxVersion.h"
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # include "VBoxX11Helper.h"
 #endif
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	(revision 60362)
@@ -298,9 +298,9 @@
     QKeySequence defaultShortcut(UIActionPoolType) const
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         return QKeySequence("U");
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         return QKeySequence("H");
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 
@@ -1064,5 +1064,5 @@
 };
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 class UIActionSimplePerformTypeCABS : public UIActionSimple
 {
@@ -1099,5 +1099,5 @@
     }
 };
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 class UIActionSimplePerformTypeCtrlBreak : public UIActionSimple
@@ -1861,5 +1861,5 @@
     }
 };
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 UIActionPoolRuntime::UIActionPoolRuntime(bool fTemporary /* = false */)
@@ -2109,7 +2109,7 @@
     m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_Settings] = new UIActionSimpleKeyboardSettings(this);
     m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_TypeCAD] = new UIActionSimplePerformTypeCAD(this);
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_TypeCABS] = new UIActionSimplePerformTypeCABS(this);
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak] = new UIActionSimplePerformTypeCtrlBreak(this);
     m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert] = new UIActionSimplePerformTypeInsert(this);
@@ -2143,5 +2143,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* 'Dock' actions: */
     m_pool[UIActionIndexRT_M_Dock] = new UIActionMenuDock(this);
@@ -2150,5 +2150,5 @@
     m_pool[UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor] = new UIActionToggleDockDisableMonitor(this);
     m_pool[UIActionIndexRT_M_Dock_M_DockSettings_T_DisableOverlay] = new UIActionToggleDockIconDisableOverlay(this);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Prepare update-handlers for known menus: */
@@ -2205,7 +2205,7 @@
     m_restrictedActionsMenuDebug[UIActionRestrictionLevel_Base] =       gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(strMachineID);
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_restrictedActionsMenuWindow[UIActionRestrictionLevel_Base] =      gEDataManager->restrictedRuntimeMenuWindowActionTypes(strMachineID);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     m_restrictedActionsMenuHelp[UIActionRestrictionLevel_Base] =        gEDataManager->restrictedRuntimeMenuHelpActionTypes(strMachineID);
 
@@ -2575,8 +2575,8 @@
     /* 'Menu Bar Settings' action: */
     addAction(pMenu, action(UIActionIndexRT_M_View_M_MenuBar_S_Settings));
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* 'Toggle Menu Bar' action: */
     addAction(pMenu, action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Mark menu as valid: */
@@ -2823,8 +2823,8 @@
     /* 'Type CAD' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCAD)) || fSeparator;
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* 'Type CABS' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCABS)) || fSeparator;
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     /* 'Type Ctrl-Break' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak)) || fSeparator;
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h	(revision 60362)
@@ -82,7 +82,7 @@
     UIActionIndexRT_M_Input_M_Keyboard_S_Settings,
     UIActionIndexRT_M_Input_M_Keyboard_S_TypeCAD,
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     UIActionIndexRT_M_Input_M_Keyboard_S_TypeCABS,
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak,
     UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert,
@@ -116,5 +116,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* 'Dock' menu actions: */
     UIActionIndexRT_M_Dock,
@@ -123,5 +123,5 @@
     UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor,
     UIActionIndexRT_M_Dock_M_DockSettings_T_DisableOverlay,
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Maximum index: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp	(revision 60362)
@@ -26,7 +26,7 @@
 # include "VBoxGlobal.h"
 # include "UISession.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -307,5 +307,5 @@
 void UIConsoleEventHandlerProxy::sltShowWindow(qint64 &winId)
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* First of all, just ask the GUI thread to show the machine-window: */
     winId = 0;
@@ -317,8 +317,8 @@
         winId = ::darwinGetCurrentProcessId();
     }
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     /* Return the ID of the top-level machine-window. */
     winId = (ULONG64)m_pSession->mainMachineWindowId();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp	(revision 60362)
@@ -60,5 +60,5 @@
 #include <math.h>
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 /* X11 includes: */
 # include <QX11Info>
@@ -67,5 +67,5 @@
 #  undef Bool // Qt5 vs Xlib gift..
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -522,10 +522,10 @@
 
 /* COM stuff: */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 static CComModule _Module;
-#else /* !Q_WS_WIN */
+#else /* !VBOX_WS_WIN */
 NS_DECL_CLASSINFO(UIFrameBufferPrivate)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(UIFrameBufferPrivate, IFramebuffer)
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
 
 
@@ -562,5 +562,5 @@
     m_iWinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Sync Qt and X11 Server (see xTracker #7547). */
     XSync(QX11Info::display(), false);
@@ -611,5 +611,5 @@
     m_iWinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Sync Qt and X11 Server (see xTracker #7547). */
     XSync(QX11Info::display(), false);
@@ -1382,5 +1382,5 @@
     QPainter painter(m_pMachineView->viewport());
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # if QT_VERSION >= 0x050000
     /* Replace translucent background with black one: */
@@ -1389,5 +1389,5 @@
     painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Draw image rectangle: */
@@ -1461,10 +1461,10 @@
 
 #if defined(VBOX_WITH_TRANSLUCENT_SEAMLESS)
-# if defined(Q_WS_WIN) || defined(Q_WS_X11) || QT_VERSION >= 0x050000
+# if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11) || QT_VERSION >= 0x050000
     /* Replace translucent background with black one: */
     painter.setCompositionMode(QPainter::CompositionMode_Source);
     painter.fillRect(paintRect, QColor(Qt::black));
     painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
-# endif /* Q_WS_WIN || Q_WS_X11 || QT_VERSION >= 0x050000 */
+# endif /* VBOX_WS_WIN || VBOX_WS_X11 || QT_VERSION >= 0x050000 */
 #endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS */
 
@@ -1509,5 +1509,5 @@
         }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # ifdef VBOX_GUI_WITH_HIDPI
         /* Should we
@@ -1520,5 +1520,5 @@
         }
 # endif /* VBOX_GUI_WITH_HIDPI */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     }
 
@@ -1569,5 +1569,5 @@
         }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # ifdef VBOX_GUI_WITH_HIDPI
         /* Should we
@@ -1580,5 +1580,5 @@
         }
 # endif /* VBOX_GUI_WITH_HIDPI */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp	(revision 60362)
@@ -22,7 +22,7 @@
 /* Qt includes: */
 # include <QKeyEvent>
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
 #  include <QX11Info>
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 
 /* GUI includes: */
@@ -42,8 +42,8 @@
 # include "UIKeyboardHandlerScale.h"
 # include "UIMouseHandler.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "UICocoaApplication.h"
 #  include "VBoxUtils-darwin.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -51,9 +51,9 @@
 
 /* Other VBox includes: */
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  if QT_VERSION >= 0x050000
 #   include "iprt/cpp/utils.h"
 #  endif /* QT_VERSION >= 0x050000 */
-# endif /* Q_WS_MAC */ 
+# endif /* VBOX_WS_MAC */ 
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -65,19 +65,19 @@
 
 /* GUI includes: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include "DarwinKeyboard.h"
-#endif /* Q_WS_MAC */
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_MAC */
+#ifdef VBOX_WS_WIN
 # include "WinKeyboard.h"
-#endif /* Q_WS_WIN */
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_WIN */
+#ifdef VBOX_WS_X11
 # include "XKeyboard.h"
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* External includes: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <Carbon/Carbon.h>
-#endif /* Q_WS_MAC */
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_MAC */
+#ifdef VBOX_WS_X11
 # include <X11/XKBlib.h>
 # include <X11/keysym.h>
@@ -95,5 +95,5 @@
 #  include <xcb/xcb.h>
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* Enums representing different keyboard-states: */
@@ -130,7 +130,7 @@
 
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 UIKeyboardHandler* UIKeyboardHandler::m_spKeyboardHandler = 0;
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 /* Factory function to create keyboard-handler: */
@@ -160,9 +160,9 @@
     }
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* It is necessary to have static pointer to created handler
      * because windows keyboard-hook works only with static members: */
     m_spKeyboardHandler = pKeyboardHandler;
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* Return prepared keyboard-handler: */
@@ -173,9 +173,9 @@
 void UIKeyboardHandler::destroy(UIKeyboardHandler *pKeyboardHandler)
 {
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* It was necessary to have static pointer to created handler
      * because windows keyboard-hook works only with static members: */
     m_spKeyboardHandler = 0;
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* Delete keyboard-handler: */
@@ -227,5 +227,5 @@
 }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 struct CHECKFORX11FOCUSEVENTSDATA
@@ -261,5 +261,5 @@
 }
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 void UIKeyboardHandler::captureKeyboard(ulong uScreenId)
@@ -272,5 +272,5 @@
     if (m_views.contains(uScreenId))
     {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
         /* On Mac, keyboard grabbing is ineffective,
@@ -287,5 +287,5 @@
         m_views[uScreenId]->grabKeyboard();
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
         /* On Win, keyboard grabbing is ineffective,
@@ -294,5 +294,5 @@
          * S.a. UIKeyboardHandler::eventFilter for more information. */
 
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 
         /* On X11, we are using passive XGrabKey for normal (windowed) mode
@@ -371,5 +371,5 @@
     if (m_views.contains(m_iKeyboardCaptureViewIndex))
     {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
         /* On Mac, keyboard grabbing is ineffective,
@@ -386,5 +386,5 @@
         m_views[m_iKeyboardCaptureViewIndex]->releaseKeyboard();
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
         /* On Win, keyboard grabbing is ineffective,
@@ -393,5 +393,5 @@
          * S.a. UIKeyboardHandler::eventFilter for more information. */
 
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 
         /* On X11, we are using passive XGrabKey for normal (windowed) mode
@@ -488,5 +488,5 @@
     }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     unsigned int hostComboModifierMask = 0;
     QList<int> hostCombo = UIHostCombo::toKeyCodeList(m_globalSettings.hostCombo());
@@ -497,5 +497,5 @@
         alphaLock | kEventKeyModifierNumLockMask |
         (aReleaseHostKey ? 0 : hostComboModifierMask);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Notify all the listeners: */
@@ -524,13 +524,13 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 void UIKeyboardHandler::winSkipKeyboardEvents(bool fSkip)
 {
     m_fSkipKeyboardEvents = fSkip;
 }
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 #if QT_VERSION < 0x050000
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
 
 bool UIKeyboardHandler::macEventFilter(const void *pvCocoaEvent, EventRef event, ulong uScreenId)
@@ -675,5 +675,5 @@
 }
 
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
 
 bool UIKeyboardHandler::winEventFilter(MSG *pMsg, ulong uScreenId)
@@ -840,5 +840,5 @@
 }
 
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
 
 static Bool UIKeyboardHandlerCompEvent(Display*, XEvent *pEvent, XPointer pvArg)
@@ -974,5 +974,5 @@
 }
 
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 #else /* QT_VERSION >= 0x050000 */
 
@@ -990,5 +990,5 @@
     bool fResult = false; /* Pass to Qt by default. */
 
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
 
     /* Acquire carbon event reference from the cocoa one: */
@@ -1125,5 +1125,5 @@
     }
 
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
 
     /* Ignore this event if m_fSkipKeyboardEvents is set by winSkipKeyboardEvents(). */
@@ -1282,5 +1282,5 @@
     }
 
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
 
     /* Cast to XCB event: */
@@ -1410,10 +1410,10 @@
                 {
                     /* Capture keyboard: */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
                     if (!isAutoCaptureDisabled() && autoCaptureSetGlobally() &&
                         GetAncestor((HWND)m_views[theListOfViewIds[i]]->winId(), GA_ROOT) == GetForegroundWindow())
-#else /* !Q_WS_WIN */
+#else /* !VBOX_WS_WIN */
                     if (!isAutoCaptureDisabled() && autoCaptureSetGlobally())
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
                         captureKeyboard(theListOfViewIds[i]);
                     /* Reset the single-time disable capture flag: */
@@ -1450,12 +1450,12 @@
     , m_fDebuggerActive(false)
     , m_iKeyboardHookViewIndex(-1)
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
     , m_uDarwinKeyModifiers(0)
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
     , m_fIsHostkeyInCapture(false)
     , m_fSkipKeyboardEvents(false)
     , m_keyboardHook(NULL)
     , m_pAltGrMonitor(0)
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 #if QT_VERSION >= 0x050000
     , m_pPrivateEventFilter(0)
@@ -1482,8 +1482,8 @@
 void UIKeyboardHandler::prepareCommon()
 {
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Prepare AltGR monitor: */
     m_pAltGrMonitor = new WinAltGrMonitor;
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* Machine state-change updater: */
@@ -1499,8 +1499,8 @@
 {
     /* Global settings: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Initialize the X keyboard subsystem: */
     initMappedX11Keyboard(QX11Info::display(), vboxGlobal().settings().publicProperty("GUI/RemapScancodes"));
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Extra data settings: */
@@ -1513,5 +1513,5 @@
 void UIKeyboardHandler::cleanupCommon()
 {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
     /* Cleanup keyboard-hook: */
@@ -1524,5 +1524,5 @@
     }
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
     /* Cleanup AltGR monitor: */
@@ -1538,5 +1538,5 @@
     }
 
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 #if QT_VERSION >= 0x050000
@@ -1592,5 +1592,5 @@
             case QEvent::FocusIn:
             {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
                 /* If keyboard-hook is NOT installed;
@@ -1618,5 +1618,5 @@
                 }
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
                 /* If keyboard-hook is NOT installed;
@@ -1636,8 +1636,8 @@
                 }
 
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 #if QT_VERSION >= 0x050000
-# if defined(Q_WS_WIN) || defined(Q_WS_X11)
+# if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
                 /* If private event-filter is NOT installed;
                  * Or installed but NOT for that view: */
@@ -1656,5 +1656,5 @@
                     qApp->installNativeEventFilter(m_pPrivateEventFilter);
                 }
-# endif /* Q_WS_WIN || Q_WS_X11 */
+# endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 #endif /* QT_VERSION >= 0x050000 */
 
@@ -1665,10 +1665,10 @@
                 {
                     /* Capture keyboard: */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
                     if (!isAutoCaptureDisabled() && autoCaptureSetGlobally() &&
                         GetAncestor((HWND)pWatchedView->winId(), GA_ROOT) == GetForegroundWindow())
-#else /* !Q_WS_WIN */
+#else /* !VBOX_WS_WIN */
                     if (!isAutoCaptureDisabled() && autoCaptureSetGlobally())
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
                         captureKeyboard(uScreenId);
                     /* Reset the single-time disable capture flag: */
@@ -1681,5 +1681,5 @@
             case QEvent::FocusOut:
             {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
                 /* If keyboard-hook is installed: */
@@ -1692,5 +1692,5 @@
                 }
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
                 /* If keyboard-hook is installed: */
@@ -1702,8 +1702,8 @@
                 }
 
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 #if QT_VERSION >= 0x050000
-# if defined(Q_WS_WIN) || defined(Q_WS_X11)
+# if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
                 /* If private event-filter is installed: */
                 if (m_pPrivateEventFilter)
@@ -1714,5 +1714,5 @@
                     m_pPrivateEventFilter = 0;
                 }
-# endif /* Q_WS_WIN || Q_WS_X11 */
+# endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 #endif /* QT_VERSION >= 0x050000 */
 
@@ -1777,5 +1777,5 @@
 }
 
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
 /* static */
@@ -1818,5 +1818,5 @@
 }
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
 /* static */
@@ -1884,5 +1884,5 @@
 }
 
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 /**
@@ -2042,10 +2042,10 @@
                     if (!uisession()->isMouseSupportsAbsolute() || !uisession()->isMouseIntegrated())
                     {
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
                         /* Make sure that pending FocusOut events from the
                          * previous message box are handled, otherwise the
                          * mouse is immediately ungrabbed: */
                         qApp->processEvents();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
                         if (m_fIsKeyboardCaptured)
                         {
@@ -2116,5 +2116,5 @@
                                          ( m_bIsHostComboPressed && !fIsFullHostComboPresent);
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     if (m_bIsHostComboPressed || isHostComboStateChanged)
     {
@@ -2122,5 +2122,5 @@
         m_fIsHostkeyInCapture = m_fIsKeyboardCaptured;
     }
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     if (keyEventCADHandled(uScan))
@@ -2226,5 +2226,5 @@
     bool fWasProcessed = false;
 
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
     Q_UNUSED(iHotKey);
@@ -2232,5 +2232,5 @@
         fWasProcessed = actionPool()->processHotKey(QKeySequence(Qt::UNICODE_ACCEL + QChar(pHotKey[0]).toUpper().unicode()));
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
     Q_UNUSED(pHotKey);
@@ -2250,5 +2250,5 @@
     delete[] pList;
 
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 
     Q_UNUSED(pHotKey);
@@ -2284,5 +2284,5 @@
      * This function will add up to 6 additional keycodes to codes. */
 
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
     /* if (uisession()->numLockAdaptionCnt()) ... - NumLock isn't implemented by Mac OS X so ignore it. */
@@ -2302,5 +2302,5 @@
     }
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
     if (uisession()->numLockAdaptionCnt() && (uisession()->isNumLock() ^ !!(GetKeyState(VK_NUMLOCK))))
@@ -2325,5 +2325,5 @@
     }
 
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 
     Window   wDummy1, wDummy2;
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h	(revision 60362)
@@ -30,8 +30,8 @@
 
 /* External includes: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <Carbon/Carbon.h>
 # include <CoreFoundation/CFBase.h>
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* Forward declarations: */
@@ -44,12 +44,12 @@
 class UIMachineView;
 class CKeyboard;
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 class WinAltGrMonitor;
-#endif /* Q_WS_WIN */
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_WIN */
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 typedef union _XEvent XEvent;
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 #if QT_VERSION >= 0x050000
 class KeyboardHandlerEventFilter;
@@ -78,9 +78,9 @@
 
     /* Commands to capture/release keyboard: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
     bool checkForX11FocusEvents(unsigned long hWindow);
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     void captureKeyboard(ulong uScreenId);
     void releaseKeyboard();
@@ -92,8 +92,8 @@
     /* Some getters required by side-code: */
     bool isHostKeyPressed() const { return m_bIsHostComboPressed; }
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     bool isHostKeyAlone() const { return m_bIsHostComboAlone; }
     bool isKeyboardGrabbed() const { return m_iKeyboardHookViewIndex != -1; }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -102,22 +102,22 @@
 #endif
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /** Tells the keyboard event handler to skip host keyboard events.
       * Used for HID LEDs sync when on Windows host a keyboard event
       * is generated in order to change corresponding LED. */
     void winSkipKeyboardEvents(bool fSkip);
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 #if QT_VERSION < 0x050000
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
     /** Qt4: Mac: Performs final pre-processing of all the native events. */
     bool macEventFilter(const void *pvCocoaEvent, EventRef event, ulong uScreenId);
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
     /** Qt4: Win: Performs final pre-processing of all the native events. */
     bool winEventFilter(MSG *pMsg, ulong uScreenId);
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
     /** Qt4: X11: Performs final pre-processing of all the native events. */
     bool x11EventFilter(XEvent *pEvent, ulong uScreenId);
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 #else /* QT_VERSION >= 0x050000 */
     /** Qt5: Performs pre-processing of all the native events. */
@@ -157,15 +157,15 @@
     bool eventFilter(QObject *pWatchedObject, QEvent *pEvent);
 
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
     /** Mac: Performs initial pre-processing of all the native keyboard events. */
     static bool macKeyboardProc(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
     /** Mac: Performs initial pre-processing of all the native keyboard events. */
     bool macKeyboardEvent(const void *pvCocoaEvent, EventRef inEvent);
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
     /** Win: Performs initial pre-processing of all the native keyboard events. */
     static LRESULT CALLBACK winKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
     /** Win: Performs initial pre-processing of all the native keyboard events. */
     bool winKeyboardEvent(UINT msg, const KBDLLHOOKSTRUCT &event);
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     bool keyEventCADHandled(uint8_t uScan);
@@ -220,8 +220,8 @@
     int m_iKeyboardHookViewIndex;
 
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
     /** Mac: Holds the current modifiers key mask. */
     UInt32 m_uDarwinKeyModifiers;
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
     /** Win: Currently this is used in winKeyboardEvent() only. */
     bool m_fIsHostkeyInCapture;
@@ -234,5 +234,5 @@
     /** Win: Holds the keyboard handler reference to be accessible from the keyboard hook. */
     static UIKeyboardHandler *m_spKeyboardHandler;
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 #if QT_VERSION >= 0x050000
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h	(revision 60362)
@@ -37,7 +37,7 @@
     UIVisualElement_VideoCapture          = RT_BIT(10),
     UIVisualElement_FeaturesStuff         = RT_BIT(11),
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     UIVisualElement_MiniToolBar           = RT_BIT(12),
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     UIVisualElement_AllStuff              = 0xFFFF
 };
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	(revision 60362)
@@ -27,10 +27,10 @@
 # include <QDateTime>
 # include <QImageWriter>
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <QMenuBar>
-# endif /* Q_WS_MAC */
-# ifdef Q_WS_X11
+# endif /* VBOX_WS_MAC */
+# ifdef VBOX_WS_X11
 #  include <QX11Info>
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 
 /* GUI includes: */
@@ -65,8 +65,8 @@
 # include "UIExtraDataManager.h"
 # include "UIAddDiskEncryptionPasswordDialog.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "DockIconPreview.h"
 #  include "UIExtraDataManager.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -84,7 +84,7 @@
 # include "CEmulatedUSB.h"
 # include "CNetworkAdapter.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "CGuest.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* Other VBox includes: */
@@ -105,13 +105,13 @@
 #endif /* VBOX_WITH_XPCOM */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include "DarwinKeyboard.h"
-#endif /* Q_WS_MAC */
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_MAC */
+#ifdef VBOX_WS_WIN
 # include "WinKeyboard.h"
-#endif /* Q_WS_WIN */
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_WIN */
+#ifdef VBOX_WS_X11
 # include <XKeyboard.h>
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -195,8 +195,8 @@
     prepareMachineWindows();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Prepare dock: */
     prepareDock();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 #if 0 /* To early! The debugger needs a VM handle to work. So, must be done after power on.  Moved to initializePostPowerUp. */
@@ -224,8 +224,8 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Cleanup dock: */
     cleanupDock();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Cleanup menu: */
@@ -350,5 +350,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineLogic::updateDockIcon()
 {
@@ -384,5 +384,5 @@
     return 0;
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineLogic::saveState()
@@ -634,5 +634,5 @@
             break;
         }
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         case KMachineState_Starting:
         case KMachineState_Restoring:
@@ -649,8 +649,8 @@
     }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Update Dock Overlay: */
     updateDockOverlay();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -699,7 +699,7 @@
         return;
 
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
     DarwinHidDevicesBroadcastLeds(m_pHostLedsState, uisession()->isNumLock(), uisession()->isCapsLock(), uisession()->isScrollLock());
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
     if (!winHidLedsInSync(uisession()->isNumLock(), uisession()->isCapsLock(), uisession()->isScrollLock()))
     {
@@ -737,5 +737,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineLogic::sltShowWindows()
 {
@@ -754,5 +754,5 @@
     }
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineLogic::sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)
@@ -809,10 +809,10 @@
     , m_pDbgGuiVT(0)
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     , m_fIsDockIconEnabled(true)
     , m_pDockIconPreview(0)
     , m_pDockPreviewSelectMonitorGroup(0)
     , m_DockIconPreviewMonitor(0)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     , m_pHostLedsState(NULL)
     , m_fIsHidLedsSyncEnabled(false)
@@ -874,5 +874,5 @@
 void UIMachineLogic::retranslateUi()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     if (m_pDockPreviewSelectMonitorGroup)
     {
@@ -884,5 +884,5 @@
         }
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /* Shared Clipboard actions: */
     if (m_pSharedClipboardActions)
@@ -898,5 +898,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineLogic::updateDockOverlay()
 {
@@ -920,14 +920,14 @@
         m_pDockIconPreview->updateDockOverlay();
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineLogic::prepareRequiredFeatures()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # ifdef VBOX_WITH_ICHAT_THEATER
     /* Init shared AV manager: */
     initSharedAVManager();
 # endif /* VBOX_WITH_ICHAT_THEATER */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -951,7 +951,7 @@
     connect(uisession(), SIGNAL(sigRuntimeError(bool, const QString &, const QString &)),
             this, SLOT(sltRuntimeError(bool, const QString &, const QString &)));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     connect(uisession(), SIGNAL(sigShowWindows()), this, SLOT(sltShowWindows()));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     connect(uisession(), SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
             this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
@@ -994,7 +994,7 @@
     m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize));
     m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCAD));
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCABS));
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak));
     m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert));
@@ -1006,7 +1006,7 @@
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowInformation));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Machine_T_Pause));
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_S_MinimizeWindow));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_S_AdjustWindow));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_S_TakeScreenshot));
@@ -1017,7 +1017,7 @@
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings));
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings));
@@ -1042,8 +1042,8 @@
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Devices_S_InstallGuestTools));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndex_M_Window));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndex_M_Window_S_Minimize));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Move actions into running-n-paused-n-stucked actions group: */
@@ -1078,8 +1078,8 @@
 
     /* 'View' actions connections: */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     connect(actionPool()->action(UIActionIndexRT_M_View_S_MinimizeWindow), SIGNAL(triggered()),
             this, SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     connect(actionPool()->action(UIActionIndexRT_M_View_S_AdjustWindow), SIGNAL(triggered()),
             this, SLOT(sltAdjustMachineWindows()));
@@ -1100,8 +1100,8 @@
     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCAD), SIGNAL(triggered()),
             this, SLOT(sltTypeCAD()));
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCABS), SIGNAL(triggered()),
             this, SLOT(sltTypeCABS()));
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak), SIGNAL(triggered()),
             this, SLOT(sltTypeCtrlBreak()));
@@ -1136,9 +1136,9 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* 'Window' action connections: */
     connect(actionPool()->action(UIActionIndex_M_Window_S_Minimize), SIGNAL(triggered()),
             this, SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -1156,7 +1156,7 @@
     m_menuUpdateHandlers[UIActionIndexRT_M_Debug] =                     &UIMachineLogic::updateMenuDebug;
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_menuUpdateHandlers[UIActionIndex_M_Window] =                      &UIMachineLogic::updateMenuWindow;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Create keyboard/mouse handlers: */
@@ -1168,5 +1168,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineLogic::prepareDock()
 {
@@ -1265,5 +1265,5 @@
     updateDockOverlay();
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -1282,10 +1282,10 @@
 void UIMachineLogic::loadSettings()
 {
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
     /* Read cached extra-data value: */
     m_fIsHidLedsSyncEnabled = gEDataManager->hidLedsSyncState(vboxGlobal().managedVMUuid());
     /* Subscribe to extra-data changes to be able to enable/disable feature dynamically: */
     connect(gEDataManager, SIGNAL(sigHidLedsSyncStateChange(bool)), this, SLOT(sltHidLedsSyncStateChanged(bool)));
-#endif /* Q_WS_MAC || Q_WS_WIN */
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
     /* HID LEDs sync initialization: */
     sltSwitchKeyboardLedsToGuestLeds();
@@ -1306,5 +1306,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineLogic::cleanupDock()
 {
@@ -1315,5 +1315,5 @@
     }
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineLogic::cleanupHandlers()
@@ -1345,7 +1345,7 @@
     disconnect(uisession(), SIGNAL(sigRuntimeError(bool, const QString &, const QString &)),
                this, SLOT(sltRuntimeError(bool, const QString &, const QString &)));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     disconnect(uisession(), SIGNAL(sigShowWindows()), this, SLOT(sltShowWindows()));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     disconnect(uisession(), SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
                this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
@@ -1373,5 +1373,5 @@
                 case QEvent::WindowActivate:
                 {
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
                     /* We should save current lock states as *previous* and
                      * set current lock states to guest values we have,
@@ -1388,8 +1388,8 @@
                         QTimer::singleShot(100, this, SLOT(sltSwitchKeyboardLedsToGuestLeds()));
                     }
-#else /* Q_WS_WIN */
+#else /* VBOX_WS_WIN */
                     /* Trigger callback synchronously for now! */
                     sltSwitchKeyboardLedsToGuestLeds();
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
                     break;
                 }
@@ -1443,5 +1443,5 @@
 }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 void UIMachineLogic::sltTypeCABS()
 {
@@ -1456,5 +1456,5 @@
     AssertWrapperOk(keyboard());
 }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 void UIMachineLogic::sltTypeCtrlBreak()
@@ -1718,5 +1718,5 @@
     }
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Due to Qt bug, modal QFileDialog appeared above the active machine-window
      * does not retreive the focus from the currently focused machine-view,
@@ -1725,5 +1725,5 @@
     if (activeMachineWindow())
         activeMachineWindow()->machineView()->clearFocus();
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* Request the filename from the user: */
@@ -1736,5 +1736,5 @@
                                                               true /* confirm overwrite */);
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Due to Qt bug, modal QFileDialog appeared above the active machine-window
      * does not retreive the focus from the currently focused machine-view,
@@ -1744,5 +1744,5 @@
     if (activeMachineWindow())
         activeMachineWindow()->machineView()->setFocus();
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     if (!strFilename.isEmpty())
@@ -1752,5 +1752,5 @@
 
         /* On X11 Qt Filedialog returns the filepath without the filetype suffix, so adding it ourselves: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         /* Add filetype suffix only if user has not added it explicitly: */
         if (!strFilename.endsWith(QString(".%1").arg(strFormat)))
@@ -1760,8 +1760,8 @@
             tmpImage.save(QDir::toNativeSeparators(QFile::encodeName(strFilename)),
                           strFormat.toUtf8().constData());
-#else /* !Q_WS_X11 */
+#else /* !VBOX_WS_X11 */
         tmpImage.save(QDir::toNativeSeparators(QFile::encodeName(strFilename)),
                       strFormat.toUtf8().constData());
-#endif /* !Q_WS_X11 */
+#endif /* !VBOX_WS_X11 */
     }
     QFile::remove(strTempFile);
@@ -2107,5 +2107,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineLogic::sltSwitchToMachineWindow()
 {
@@ -2184,5 +2184,5 @@
     gEDataManager->setDockIconDisableOverlay(fDisabled, vboxGlobal().managedVMUuid());
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineLogic::sltSwitchKeyboardLedsToGuestLeds()
@@ -2214,9 +2214,9 @@
         return;
 
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
     if (m_pHostLedsState == NULL)
         m_pHostLedsState = DarwinHidDevicesKeepLedsState();
     DarwinHidDevicesBroadcastLeds(m_pHostLedsState, uisession()->isNumLock(), uisession()->isCapsLock(), uisession()->isScrollLock());
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
     if (m_pHostLedsState == NULL)
         m_pHostLedsState = WinHidDevicesKeepLedsState();
@@ -2249,7 +2249,7 @@
                  does dispatch loop fun, that's probably the reason for it.  Hopefully not an issue on OS X. */
         m_pHostLedsState = NULL;
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
         DarwinHidDevicesApplyAndReleaseLedsState(pvLedState);
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
         keyboardHandler()->winSkipKeyboardEvents(true);
         WinHidDevicesApplyAndReleaseLedsState(pvLedState);
@@ -2522,5 +2522,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineLogic::updateMenuWindow(QMenu *pMenu)
 {
@@ -2545,5 +2545,5 @@
     }
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineLogic::showGlobalPreferences(const QString &strCategory /* = QString() */, const QString &strControl /* = QString() */)
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h	(revision 60362)
@@ -134,9 +134,9 @@
     void openNetworkSettingsDialog() { sltOpenNetworkSettingsDialog(); }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     void updateDockIcon();
     void updateDockIconSize(int screenId, int width, int height);
     UIMachineView* dockPreviewView() const;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** Save VM state, then close Runtime UI. */
@@ -206,9 +206,9 @@
     void addMachineWindow(UIMachineWindow *pMachineWindow);
     void retranslateUi();
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     bool isDockIconPreviewEnabled() const { return m_fIsDockIconEnabled; }
     void setDockIconPreviewEnabled(bool fIsDockIconPreviewEnabled) { m_fIsDockIconEnabled = fIsDockIconPreviewEnabled; }
     void updateDockOverlay();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Prepare helpers: */
@@ -221,7 +221,7 @@
     virtual void prepareMachineWindows() = 0;
     virtual void prepareMenu() {}
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     virtual void prepareDock();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 #ifdef VBOX_WITH_DEBUGGER_GUI
     virtual void prepareDebugger();
@@ -234,7 +234,7 @@
     virtual void cleanupDebugger();
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     virtual void cleanupDock();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     virtual void cleanupMenu() {}
     virtual void cleanupMachineWindows() = 0;
@@ -258,7 +258,7 @@
     void sltToggleMouseIntegration(bool fEnabled);
     void sltTypeCAD();
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     void sltTypeCABS();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     void sltTypeCtrlBreak();
     void sltTypeInsert();
@@ -346,8 +346,8 @@
     void updateMenuDebug(QMenu *pMenu);
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Update 'Window' menu routine. */
     void updateMenuWindow(QMenu *pMenu);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** Show Global Preferences on the page defined by @a strCategory and tab defined by @a strControl. */
@@ -395,10 +395,10 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     bool m_fIsDockIconEnabled;
     UIDockIconPreview *m_pDockIconPreview;
     QActionGroup *m_pDockPreviewSelectMonitorGroup;
     int m_DockIconPreviewMonitor;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     void *m_pHostLedsState;
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp	(revision 60362)
@@ -42,7 +42,7 @@
 # include "UIFrameBuffer.h"
 # include "VBoxFBOverlay.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "UICocoaApplication.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 # ifdef VBOX_WITH_DRAG_AND_DROP
 #  include "UIDnDHandler.h"
@@ -72,8 +72,8 @@
 
 /* GUI includes: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include "DarwinKeyboard.h"
 # include "DockIconPreview.h"
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -87,14 +87,14 @@
 #include <VBox/VBoxOGL.h>
 #include <VBox/VBoxVideo.h>
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <VBox/err.h>
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* External includes: */
 #include <math.h>
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <Carbon/Carbon.h>
-#endif /* Q_WS_MAC */
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_MAC */
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 #  include <X11/XKBlib.h>
@@ -112,5 +112,5 @@
 #  include <xcb/xcb.h>
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 #ifdef DEBUG_andy
@@ -371,8 +371,8 @@
         frameBuffer()->performRescale();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Update MacOS X dock icon size: */
         machineLogic()->updateDockIconSize(screenId(), iWidth, iHeight);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     }
 
@@ -419,5 +419,5 @@
     rect.translate(-contentsX(), -contentsY());
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Take the backing-scale-factor into account: */
     if (frameBuffer()->useUnscaledHiDPIOutput())
@@ -432,5 +432,5 @@
         }
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Limit the resulting part by the viewport rectangle: */
@@ -611,7 +611,7 @@
     , m_pFrameBuffer(0)
     , m_previousState(KMachineState_Null)
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     , m_iHostScreenNumber(0)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     , m_maxGuestSizePolicy(MaxGuestSizePolicy_Invalid)
     , m_u64MaxGuestSize(0)
@@ -693,8 +693,8 @@
         m_pFrameBuffer->setScalingOptimizationType(gEDataManager->scalingOptimizationType(vboxGlobal().managedVMUuid()));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Take backing scale-factor into account: */
         m_pFrameBuffer->setBackingScaleFactor(darwinBackingScaleFactor(machineWindow()));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
         /* Take the scale-factor related attributes into account: */
@@ -729,10 +729,10 @@
     QSize size;
     {
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         /* Processing pseudo resize-event to synchronize frame-buffer with stored framebuffer size.
          * On X11 this will be additional done when the machine state was 'saved'. */
         if (machine().GetState() == KMachineState_Saved)
             size = guestScreenSizeHint();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
         /* If there is a preview image saved,
@@ -1100,5 +1100,5 @@
     /* Finally copy the screen-shot to pause-pixmap: */
     m_pausePixmap = QPixmap::fromImage(screenShot);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # ifdef VBOX_GUI_WITH_HIDPI
     /* Adjust backing-scale-factor if necessary: */
@@ -1107,5 +1107,5 @@
         m_pausePixmap.setDevicePixelRatio(dBackingScaleFactor);
 # endif /* VBOX_GUI_WITH_HIDPI */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Update scaled pause pixmap: */
@@ -1137,5 +1137,5 @@
     /* Finally copy the screen-shot to pause-pixmap: */
     m_pausePixmap = QPixmap::fromImage(screenShot);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # ifdef VBOX_GUI_WITH_HIDPI
     /* Adjust backing-scale-factor if necessary: */
@@ -1144,5 +1144,5 @@
         m_pausePixmap.setDevicePixelRatio(dBackingScaleFactor);
 # endif /* VBOX_GUI_WITH_HIDPI */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Update scaled pause pixmap: */
@@ -1163,5 +1163,5 @@
     /* Update pause pixmap finally: */
     m_pausePixmapScaled = pausePixmap().scaled(scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # ifdef VBOX_GUI_WITH_HIDPI
     /* Adjust backing-scale-factor if necessary: */
@@ -1170,5 +1170,5 @@
         m_pausePixmapScaled.setDevicePixelRatio(dBackingScaleFactor);
 # endif /* VBOX_GUI_WITH_HIDPI */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -1193,5 +1193,5 @@
     int yRange = frameBufferSize.height() - curViewportSize.height();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Due to Qt 4.x doesn't supports HiDPI directly
      * we should take the backing-scale-factor into account.
@@ -1206,5 +1206,5 @@
         }
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Configure scroll-bars: */
@@ -1221,5 +1221,5 @@
     int iContentsY = contentsY();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Due to Qt 4.x doesn't supports HiDPI directly
      * we should take the backing-scale-factor into account.
@@ -1234,5 +1234,5 @@
         }
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Return point shifted according scroll-bars: */
@@ -1294,5 +1294,5 @@
 
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineView::updateDockIcon()
 {
@@ -1329,5 +1329,5 @@
     return ir;
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 UIVisualStateType UIMachineView::visualStateType() const
@@ -1346,5 +1346,5 @@
     switch (pEvent->type())
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Event posted OnShowWindow: */
         case ShowWindowEventType:
@@ -1359,5 +1359,5 @@
             return true;
         }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -1433,5 +1433,5 @@
                 break;
             }
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             case QEvent::Move:
             {
@@ -1457,5 +1457,5 @@
                 break;
             }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
             default:
                 break;
@@ -1494,8 +1494,8 @@
         else
             painter.drawPixmap(rect.topLeft(), pausePixmapScaled());
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Update the dock icon: */
         updateDockIcon();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         return;
     }
@@ -1504,9 +1504,9 @@
     if (m_pFrameBuffer)
         m_pFrameBuffer->handlePaintEvent(pPaintEvent);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Update the dock icon if we are in the running state: */
     if (uisession()->isRunning())
         updateDockIcon();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -1692,5 +1692,5 @@
 
 #if QT_VERSION < 0x050000
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
 
 bool UIMachineView::macEvent(const void *pvCocoaEvent, EventRef event)
@@ -1737,5 +1737,5 @@
 }
 
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
 
 bool UIMachineView::winEvent(MSG *pMsg, long* /* piResult */)
@@ -1779,5 +1779,5 @@
 }
 
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
 
 bool UIMachineView::x11Event(XEvent *pEvent)
@@ -1817,10 +1817,10 @@
 }
 
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 #else /* QT_VERSION >= 0x050000 */
 
 bool UIMachineView::nativeEvent(const QByteArray &eventType, void *pMessage)
 {
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
 
     /* Make sure it's generic NSEvent: */
@@ -1857,5 +1857,5 @@
     }
 
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
 
     /* Make sure it's generic MSG event: */
@@ -1882,5 +1882,5 @@
     }
 
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
 
     /* Make sure it's generic XCB event: */
@@ -1924,5 +1924,5 @@
         size = QSize((int)(size.width() * dScaleFactor), (int)(size.height() * dScaleFactor));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Take the backing-scale-factor into account: */
     if (frameBuffer()->useUnscaledHiDPIOutput())
@@ -1932,5 +1932,5 @@
             size = QSize(size.width() / dBackingScaleFactor, size.height() / dBackingScaleFactor);
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Return result: */
@@ -1940,5 +1940,5 @@
 QSize UIMachineView::scaledBackward(QSize size) const
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Take the backing-scale-factor into account: */
     if (frameBuffer()->useUnscaledHiDPIOutput())
@@ -1948,5 +1948,5 @@
             size = QSize(size.width() * dBackingScaleFactor, size.height() * dBackingScaleFactor);
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Take the scale-factor into account: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h	(revision 60362)
@@ -35,14 +35,14 @@
 /* Other VBox includes: */
 #include "VBox/com/ptr.h"
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # if QT_VERSION >= 0x050000
 #  include <ApplicationServices/ApplicationServices.h>
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* External includes: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <CoreFoundation/CFBase.h>
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* Forward declarations: */
@@ -57,9 +57,9 @@
 class CMachine;
 class CSession;
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 typedef union _XEvent XEvent;
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 #ifdef VBOX_WITH_DRAG_AND_DROP
  class CDnDTarget;
@@ -262,9 +262,9 @@
     static void dimImage(QImage &img);
     void scrollContentsBy(int dx, int dy);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     void updateDockIcon();
     CGImageRef vmContentImage();
     CGImageRef frameBuffertoCGImageRef(UIFrameBuffer *pFrameBuffer);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** What view mode (normal, fullscreen etc.) are we in? */
     UIVisualStateType visualStateType() const;
@@ -346,5 +346,5 @@
 
 #if QT_VERSION < 0x050000
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
     /** Qt4: Mac: Performs pre-processing of all the native events.
       * @note     Take into account this function is _not_ called by
@@ -352,5 +352,5 @@
       *           only by the keyboard-hook of the keyboard-handler. */
     virtual bool macEvent(const void *pvCocoaEvent, EventRef event);
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
     /** Qt4: Win: Performs pre-processing of all the native events.
       * @note     Take into account this function is called by
@@ -358,5 +358,5 @@
       *           because it has required signature. */
     virtual bool winEvent(MSG *pMsg, long *piResult);
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
     /** Qt4: X11: Performs pre-processing of all the native events.
       * @note     Take into account this function is called by
@@ -364,5 +364,5 @@
       *           because it has required signature. */
     virtual bool x11Event(XEvent *pEvent);
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 #else /* QT_VERSION >= 0x050000 */
     /** Qt5: Performs pre-processing of all the native events.
@@ -388,8 +388,8 @@
     QSize m_sizeHintOverride;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Holds current host-screen number. */
     int m_iHostScreenNumber;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** The policy for calculating the maximum guest resolution which we wish
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp	(revision 60362)
@@ -56,9 +56,9 @@
 
 /* External includes: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 #  include <X11/Xlib.h>
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -181,5 +181,5 @@
     , m_pRightSpacer(0)
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* On Mac OS X window icon referenced in info.plist is used. */
 
@@ -194,5 +194,5 @@
     else
         setWindowIcon(vboxGlobal().vmGuestOSTypeIcon(machine().GetOSTypeId()));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -261,5 +261,5 @@
 }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 bool UIMachineWindow::x11Event(XEvent *pEvent)
@@ -284,5 +284,5 @@
 }
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 void UIMachineWindow::showEvent(QShowEvent *pShowEvent)
@@ -558,8 +558,8 @@
             strMachineName += " [" + gpConverter->toString(state) + "]";
         /* Unusual on the Mac. */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         const QString strUserProductName = uisession()->machineWindowNamePostfix();
         strMachineName += " - " + (strUserProductName.isEmpty() ? defaultWindowTitle() : strUserProductName);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         if (machine().GetMonitorCount() > 1)
             strMachineName += QString(" : %1").arg(m_uScreenId + 1);
@@ -591,5 +591,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineWindow::handleStandardWindowButtonCallback(StandardWindowButtonType enmButtonType, bool fWithOptionKey)
 {
@@ -652,4 +652,4 @@
     }
 }
-#endif /* Q_WS_MAC */
-
+#endif /* VBOX_WS_MAC */
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h	(revision 60362)
@@ -25,7 +25,7 @@
 #include "QIWithRetranslateUI.h"
 #include "UIExtraDataDefs.h"
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -42,9 +42,9 @@
 class UIMachineView;
 class CSession;
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 typedef union _XEvent XEvent;
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -122,10 +122,10 @@
 
     /* Event handlers: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
     /** X11: Qt4: Handles all native events. */
     bool x11Event(XEvent *pEvent);
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /** Show event handler. */
@@ -135,5 +135,5 @@
     void closeEvent(QCloseEvent *pCloseEvent);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Handles native notifications.
       * @param  strNativeNotificationName  Native notification name. */
@@ -144,5 +144,5 @@
       * @param  fWithOptionKey  Brings whether the Option key was held. */
     virtual void handleStandardWindowButtonCallback(StandardWindowButtonType enmButtonType, bool fWithOptionKey);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Prepare helpers: */
@@ -176,5 +176,5 @@
     static Qt::Alignment viewAlignment(UIVisualStateType visualStateType);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Handles native notifications.
       * @param  strNativeNotificationName  Native notification name.
@@ -187,5 +187,5 @@
       * @param  pWidget         Brings widget, callback related to. */
     static void handleStandardWindowButtonCallback(StandardWindowButtonType enmButtonType, bool fWithOptionKey, QWidget *pWidget);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Variables: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp	(revision 60362)
@@ -27,7 +27,7 @@
 # include <QPainter>
 # include <QMenu>
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include <QCheckBox>
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -57,7 +57,7 @@
     , m_pToolBar(0)
     , m_pButtonClose(0)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     , m_pCheckBoxEnable(0)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 {
     /* Prepare: */
@@ -81,5 +81,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 bool UIMenuBarEditorWidget::isMenuBarEnabled() const
 {
@@ -101,5 +101,5 @@
     m_pCheckBoxEnable->setChecked(fEnabled);
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 void UIMenuBarEditorWidget::setRestrictionsOfMenuBar(UIExtraDataMetaDefs::MenuType restrictions)
@@ -308,5 +308,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMenuBarEditorWidget::setRestrictionsOfMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType restrictions)
 {
@@ -337,5 +337,5 @@
     }
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMenuBarEditorWidget::setRestrictionsOfMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType restrictions)
@@ -384,7 +384,7 @@
     setRestrictionsOfMenuDebug(gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(machineID()));
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     setRestrictionsOfMenuWindow(gEDataManager->restrictedRuntimeMenuWindowActionTypes(machineID()));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     setRestrictionsOfMenuHelp(gEDataManager->restrictedRuntimeMenuHelpActionTypes(machineID()));
 }
@@ -534,5 +534,5 @@
         }
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         case UIExtraDataMetaDefs::MenuType_Window:
         {
@@ -554,5 +554,5 @@
             break;
         }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         case UIExtraDataMetaDefs::MenuType_Help:
         {
@@ -602,9 +602,9 @@
         if (iTop >= 5)
             iTop -= 5;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Right margin should be bigger for the settings case: */
         if (m_fStartedFromVMSettings)
             iRight += 5;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /* Apply margins/spacing finally: */
         m_pMainLayout->setContentsMargins(iLeft, iTop, iRight, iBottom);
@@ -636,5 +636,5 @@
             }
         }
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Create enable-checkbox if necessary: */
         else
@@ -649,5 +649,5 @@
             }
         }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 
@@ -670,7 +670,7 @@
     prepareMenuDebug();
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     prepareMenuWindow();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     prepareMenuHelp();
 
@@ -687,7 +687,7 @@
         setRestrictionsOfMenuDebug(gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(machineID()));
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         setRestrictionsOfMenuWindow(gEDataManager->restrictedRuntimeMenuWindowActionTypes(machineID()));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         setRestrictionsOfMenuHelp(gEDataManager->restrictedRuntimeMenuHelpActionTypes(machineID()));
         /* And listen for the menu-bar configuration changes after that: */
@@ -697,5 +697,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 QMenu* UIMenuBarEditorWidget::prepareNamedMenu(const QString &strName)
 {
@@ -734,5 +734,5 @@
     return pNamedMenu;
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 QMenu* UIMenuBarEditorWidget::prepareCopiedMenu(const UIAction *pAction)
@@ -843,12 +843,12 @@
 {
     /* Copy menu: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     QMenu *pMenu = prepareNamedMenu("Application");
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     QMenu *pMenu = prepareCopiedMenu(actionPool()->action(UIActionIndex_M_Application));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     AssertPtrReturnVoid(pMenu);
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_M_Application_S_About));
 # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -858,5 +858,5 @@
         pMenu->addSeparator();
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_M_Application_S_Preferences));
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_M_Application_S_Preferences));
         pMenu->addSeparator();
@@ -865,5 +865,5 @@
 # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 }
@@ -966,5 +966,5 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMenuBarEditorWidget::prepareMenuWindow()
 {
@@ -980,5 +980,5 @@
     }
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMenuBarEditorWidget::prepareMenuHelp()
@@ -991,7 +991,7 @@
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_Simple_WebSite));
         pMenu->addSeparator();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_Simple_About));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 }
@@ -1002,9 +1002,9 @@
     if (!m_fStartedFromVMSettings && m_pButtonClose)
         m_pButtonClose->setToolTip(tr("Close"));
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Translate enable-checkbox if necessary: */
     if (m_fStartedFromVMSettings && m_pCheckBoxEnable)
         m_pCheckBoxEnable->setToolTip(tr("Enable Menu Bar"));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -1020,7 +1020,7 @@
     color1.setAlpha(0);
     QColor color2 = pal.color(QPalette::Window).darker(200);
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     QColor color3 = pal.color(QPalette::Window).darker(120);
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
     /* Left corner: */
@@ -1063,5 +1063,5 @@
     painter.fillRect(QRect(width() - 5, 0, 5, height() - 5), grad5); // right line
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /* Paint frames: */
     painter.save();
@@ -1073,15 +1073,15 @@
         painter.drawLine(QLine(QPoint(width() - 1 - 5 - 1, 0), QPoint(5 + 1, 0)));
     painter.restore();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 }
 
 
 UIMenuBarEditorWindow::UIMenuBarEditorWindow(UIMachineWindow *pParent, UIActionPool *pActionPool)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     : UISlidingToolBar(pParent, pParent->menuBar(), new UIMenuBarEditorWidget(0, false, vboxGlobal().managedVMUuid(), pActionPool), UISlidingToolBar::Position_Top)
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     : UISlidingToolBar(pParent, 0, new UIMenuBarEditorWidget(0, false, vboxGlobal().managedVMUuid(), pActionPool), UISlidingToolBar::Position_Top)
-#endif /* Q_WS_MAC */
-{
-}
-
+#endif /* VBOX_WS_MAC */
+{
+}
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.h	(revision 60362)
@@ -33,7 +33,7 @@
 class UIAction;
 class QIToolButton;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 class QCheckBox;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 class QHBoxLayout;
 class QAction;
@@ -86,10 +86,10 @@
     void setActionPool(UIActionPool *pActionPool);
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** Returns whether the menu-bar enabled. */
     bool isMenuBarEnabled() const;
     /** Defines whether the menu-bar @a fEnabled. */
     void setMenuBarEnabled(bool fEnabled);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /** Returns the cached restrictions of menu-bar. */
@@ -109,8 +109,8 @@
     UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictionsOfMenuDebug() const { return m_restrictionsOfMenuDebug; }
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Returns the cached restrictions of menu 'Window'. */
     UIExtraDataMetaDefs::MenuWindowActionType restrictionsOfMenuWindow() const { return m_restrictionsOfMenuWindow; }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** Returns the cached restrictions of menu 'Help'. */
     UIExtraDataMetaDefs::MenuHelpActionType restrictionsOfMenuHelp() const { return m_restrictionsOfMenuHelp; }
@@ -132,8 +132,8 @@
     void setRestrictionsOfMenuDebug(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType restrictions);
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Defines the cached @a restrictions of menu 'Window'. */
     void setRestrictionsOfMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType restrictions);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** Defines the cached @a restrictions of menu 'Help'. */
     void setRestrictionsOfMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType restrictions);
@@ -152,8 +152,8 @@
     void prepare();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Prepare named menu routine. */
     QMenu* prepareNamedMenu(const QString &strName);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** Prepare copied menu routine. */
     QMenu* prepareCopiedMenu(const UIAction *pAction);
@@ -184,8 +184,8 @@
     void prepareMenuDebug();
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Prepare 'Window' menu routine. */
     void prepareMenuWindow();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** Prepare 'Help' menu routine. */
     void prepareMenuHelp();
@@ -217,8 +217,8 @@
         /** Holds the close-button instance. */
         QIToolButton *m_pButtonClose;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /** Non Mac OS X: Holds the enable-checkbox instance. */
         QCheckBox *m_pCheckBoxEnable;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /** Holds tool-bar action references. */
         QMap<QString, QAction*> m_actions;
@@ -243,8 +243,8 @@
         UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType m_restrictionsOfMenuDebug;
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /** Mac OS X: Holds the cached restrictions of menu 'Window'. */
         UIExtraDataMetaDefs::MenuWindowActionType m_restrictionsOfMenuWindow;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         /** Holds the cached restrictions of menu 'Help'. */
         UIExtraDataMetaDefs::MenuHelpActionType m_restrictionsOfMenuHelp;
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp	(revision 60362)
@@ -37,10 +37,10 @@
 # include "UIMouseHandler.h"
 # include "UIFrameBuffer.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils-darwin.h"
-# endif /* Q_WS_MAC */
-# ifdef Q_WS_WIN
+# endif /* VBOX_WS_MAC */
+# ifdef VBOX_WS_WIN
 #  include "VBoxUtils-win.h"
-# endif /* Q_WS_WIN */
+# endif /* VBOX_WS_WIN */
 
 /* COM includes: */
@@ -59,5 +59,5 @@
 
 /* External includes: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 #  include <X11/Xlib.h>
@@ -67,5 +67,5 @@
 #  endif /* FocusOut */
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -186,5 +186,5 @@
         visibleRectangle = visibleRectangle.intersected(vboxGlobal().availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
         /* Move the mouse to the center of the visible area: */
         m_lastMousePos = visibleRectangle.center();
@@ -192,13 +192,13 @@
         /* Update mouse clipping: */
         updateMouseCursorClipping();
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
         /* Grab all mouse events: */
         ::darwinMouseGrab(m_viewports[m_iMouseCaptureViewIndex]);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         /* Remember current mouse position: */
         m_lastMousePos = QCursor::pos();
         /* Grab all mouse events: */
         m_viewports[m_iMouseCaptureViewIndex]->grabMouse();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
         /* Switch guest mouse to the relative mode: */
@@ -224,14 +224,14 @@
         /* Return the cursor to where it was when we captured it: */
         QCursor::setPos(m_capturedMousePos);
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
         /* Update mouse clipping: */
         updateMouseCursorClipping();
-#elif defined(Q_WS_MAC)
+#elif defined(VBOX_WS_MAC)
         /* Releasing grabbed mouse from that view: */
         ::darwinMouseRelease(m_viewports[m_iMouseCaptureViewIndex]);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         /* Releasing grabbed mouse from that view: */
         m_viewports[m_iMouseCaptureViewIndex]->releaseMouse();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /* Reset mouse-capture index: */
         m_iMouseCaptureViewIndex = -1;
@@ -264,5 +264,5 @@
 }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 bool UIMouseHandler::x11EventFilter(XEvent *pEvent, ulong /* uScreenId */)
@@ -294,5 +294,5 @@
 }
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* Machine state-change handler: */
@@ -436,9 +436,9 @@
         /* Activate it: */
         m_pHoveredWindow->activateWindow();
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         /* On X11 its not enough to just activate window if you
          * want to raise it also, so we will make it separately: */
         m_pHoveredWindow->raise();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     }
 }
@@ -503,5 +503,5 @@
         if (m_windows.values().contains(pWatchedWidget))
         {
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
             /* Handle window events: */
             switch (pEvent->type())
@@ -517,5 +517,5 @@
                     break;
             }
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
         }
 
@@ -553,5 +553,5 @@
             switch (pEvent->type())
             {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                 case UIGrabMouseEvent::GrabMouseEvent:
                 {
@@ -566,5 +566,5 @@
                     break;
                 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
                 case QEvent::MouseMove:
                 case QEvent::MouseButtonRelease:
@@ -604,5 +604,5 @@
                     }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
                     /* Make sure that we are focused after a click.  Rather
                      * ugly, but works around a problem with GNOME
@@ -611,5 +611,5 @@
                     if (pEvent->type() == QEvent::MouseButtonRelease)
                         pWatchedWidget->window()->activateWindow();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
                     /* Check if we should activate window under cursor: */
                     if (gEDataManager->activateHoveredMachineWindow() &&
@@ -667,17 +667,17 @@
                     if (mouseEvent(pWheelEvent->type(), uScreenId,
                                    pWheelEvent->pos(), pWheelEvent->globalPos(),
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                                    /* Qt Cocoa is buggy. It always reports a left button pressed when the
                                     * mouse wheel event occurs. A workaround is to ask the application which
                                     * buttons are pressed currently: */
                                    QApplication::mouseButtons(),
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
                                    pWheelEvent->buttons(),
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
                                    iDelta, pWheelEvent->orientation()))
                         return true;
                     break;
                 }
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                 case QEvent::Leave:
                 {
@@ -697,6 +697,6 @@
                     break;
                 }
-#endif /* Q_WS_MAC */
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_MAC */
+#ifdef VBOX_WS_WIN
                 case QEvent::Resize:
                 {
@@ -705,5 +705,5 @@
                     break;
                 }
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
                 default:
                     break;
@@ -715,5 +715,5 @@
 
 /* Try to detect if the mouse event is fake and actually generated by a touch device. */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 #if (WINVER < 0x0601)
 typedef enum tagINPUT_MESSAGE_DEVICE_TYPE {
@@ -776,5 +776,5 @@
 }
 #else
-/* Apparently Q_WS_MAC does not generate fake mouse events.
+/* Apparently VBOX_WS_MAC does not generate fake mouse events.
  * Other platforms, which have no known method to detect fake events are handled here too.
  */
@@ -817,5 +817,5 @@
         iMouseButtonsState |= KMouseButtonState_XButton2;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Simulate the right click on host-key + left-mouse-button: */
     if (machineLogic()->keyboardHandler()->isHostKeyPressed() &&
@@ -823,5 +823,5 @@
         iMouseButtonsState == KMouseButtonState_LeftButton)
         iMouseButtonsState = KMouseButtonState_RightButton;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     int iWheelVertical = 0;
@@ -839,5 +839,5 @@
     if (uisession()->isMouseCaptured())
     {
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
         /* Send pending WM_PAINT events: */
         ::UpdateWindow((HWND)m_viewports[uScreenId]->winId());
@@ -847,5 +847,5 @@
                               iWheelVertical, iWheelHorizontal, iMouseButtonsState);
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
         /* Bringing mouse to the opposite side to simulate the endless moving: */
 
@@ -880,5 +880,5 @@
         else
             m_lastMousePos = globalPos;
-#else /* Q_WS_WIN */
+#else /* VBOX_WS_WIN */
         int iWe = QApplication::desktop()->width() - 1;
         int iHe = QApplication::desktop()->height() - 1;
@@ -897,11 +897,11 @@
             m_lastMousePos =  p;
             /* No need for cursor updating on the Mac, there is no one. */
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
             QCursor::setPos(m_lastMousePos);
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
         }
         else
             m_lastMousePos = globalPos;
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
         return true; /* stop further event handling */
     }
@@ -940,5 +940,5 @@
             }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             /* Take the backing-scale-factor into account: */
             if (pFrameBuffer->useUnscaledHiDPIOutput())
@@ -951,5 +951,5 @@
                 }
             }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
@@ -1024,9 +1024,9 @@
                     if (ok)
                     {
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
                         /* Make sure that pending FocusOut events from the previous message box are handled,
                          * otherwise the mouse is immediately ungrabbed again: */
                         qApp->processEvents();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
                         machineLogic()->keyboardHandler()->captureKeyboard(uScreenId);
                         const MouseCapturePolicy mcp = gEDataManager->mouseCapturePolicy(vboxGlobal().managedVMUuid());
@@ -1101,5 +1101,5 @@
 }
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 /* This method is actually required only because under win-host
  * we do not really grab the mouse in case of capturing it: */
@@ -1148,4 +1148,4 @@
     }
 }
-#endif /* Q_WS_WIN */
-
+#endif /* VBOX_WS_WIN */
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h	(revision 60362)
@@ -38,9 +38,9 @@
 class CDisplay;
 class CMouse;
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
 typedef union _XEvent XEvent;
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -75,10 +75,10 @@
     int state() const;
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # if QT_VERSION < 0x050000
     /** X11: Qt4: Handles all native events. */
     bool x11EventFilter(XEvent *pEvent, ulong uScreenId);
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 protected slots:
@@ -123,10 +123,10 @@
     bool multiTouchEvent(QTouchEvent *pTouchEvent, ulong uScreenId);
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* This method is actually required only because under win-host
      * we do not really grab the mouse in case of capturing it: */
     void updateMouseCursorClipping();
     QRect m_mouseCursorClippingRect;
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* Machine logic parent: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp	(revision 60362)
@@ -24,7 +24,7 @@
 # include <QDesktopWidget>
 # include <QWidget>
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <QTimer>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -47,8 +47,8 @@
 #  include "VBoxFBOverlay.h"
 # endif /* VBOX_WITH_VIDEOHWACCEL */
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "UIMenuBar.h"
 #  include "VBoxUtils-darwin.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 # ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
@@ -73,15 +73,15 @@
 
 /* Qt includes: */
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 # if QT_VERSION >= 0x050000
 #  include <QtWin>
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_WIN */
-
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_WIN */
+
+#ifdef VBOX_WS_X11
 # include <QX11Info>
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 #ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
@@ -89,5 +89,5 @@
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 /**
  * MacOS X: Application Services: Core Graphics: Display reconfiguration callback.
@@ -124,5 +124,5 @@
     Q_UNUSED(display);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* static */
@@ -253,11 +253,11 @@
 
 /* Log whether HID LEDs sync is enabled: */
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
     LogRel(("GUI: HID LEDs sync is %s\n",
             uimachine()->machineLogic()->isHidLedsSyncEnabled()
             ? "enabled" : "disabled"));
-#else /* !Q_WS_MAC && !Q_WS_WIN */
+#else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
     LogRel(("GUI: HID LEDs sync is not supported on this platform\n"));
-#endif /* !Q_WS_MAC && !Q_WS_WIN */
+#endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
 
 #ifdef VBOX_GUI_WITH_PIDFILE
@@ -936,20 +936,20 @@
     , m_pMachine(pMachine)
     , m_pActionPool(0)
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     , m_pMenuBar(0)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /* Common variables: */
     , m_machineStatePrevious(KMachineState_Null)
     , m_machineState(KMachineState_Null)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     , m_pMachineWindowIcon(0)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     , m_requestedVisualStateType(UIVisualStateType_Invalid)
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     , m_alphaCursor(0)
-#endif /* Q_WS_WIN */
-#ifdef Q_WS_MAC
+#endif /* VBOX_WS_WIN */
+#ifdef VBOX_WS_MAC
     , m_pWatchdogDisplayChange(0)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     , m_defaultCloseAction(MachineCloseAction_Invalid)
     , m_restrictedCloseActions(MachineCloseAction_Invalid)
@@ -1094,5 +1094,5 @@
         updateActionRestrictions();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Create Mac OS X menu-bar: */
         m_pMenuBar = new UIMenuBar;
@@ -1105,5 +1105,5 @@
             updateMenu();
         }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     }
 }
@@ -1113,8 +1113,8 @@
     connect(this, SIGNAL(sigInitialized()), this, SLOT(sltMarkInitialized()));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Install native display reconfiguration callback: */
     CGDisplayRegisterReconfigurationCallback(cgDisplayReconfigurationCallback, this);
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     /* Install Qt display reconfiguration callbacks: */
     connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)),
@@ -1124,5 +1124,5 @@
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
             this, SLOT(sltHandleHostScreenAvailableAreaChange()));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -1175,8 +1175,8 @@
             this, SIGNAL(sigRuntimeError(bool, QString, QString)));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     connect(gConsoleEvents, SIGNAL(sigShowWindow()),
             this, SIGNAL(sigShowWindows()), Qt::QueuedConnection);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     connect(gConsoleEvents, SIGNAL(sigCPUExecutionCapChange()),
@@ -1192,5 +1192,5 @@
     updateHostScreenData();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Prepare display-change watchdog: */
     m_pWatchdogDisplayChange = new QTimer(this);
@@ -1201,5 +1201,5 @@
                 this, SLOT(sltCheckIfHostDisplayChanged()));
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Prepare initial screen visibility status: */
@@ -1268,5 +1268,5 @@
         const QString strMachineID = vboxGlobal().managedVMUuid();
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Load/prepare user's machine-window icon: */
         QIcon icon;
@@ -1279,5 +1279,5 @@
         /* Load user's machine-window name postfix: */
         m_strMachineWindowNamePostfix = gEDataManager->machineWindowNamePostfix(strMachineID);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
         /* Is there should be First RUN Wizard? */
@@ -1288,5 +1288,5 @@
         pGuestAutoresizeSwitch->setChecked(gEDataManager->guestScreenAutoResizeEnabled(strMachineID));
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Menu-bar options: */
         {
@@ -1301,5 +1301,5 @@
             pActionMenuBarSwitch->blockSignals(false);
         }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
         /* Status-bar options: */
@@ -1345,9 +1345,9 @@
         }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Cleanup user's machine-window icon: */
         delete m_pMachineWindowIcon;
         m_pMachineWindowIcon = 0;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 }
@@ -1381,17 +1381,17 @@
 void UISession::cleanupConnections()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Remove display reconfiguration callback: */
     CGDisplayRemoveReconfigurationCallback(cgDisplayReconfigurationCallback, this);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
 void UISession::cleanupActions()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Destroy Mac OS X menu-bar: */
     delete m_pMenuBar;
     m_pMenuBar = 0;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Destroy action-pool if necessary: */
@@ -1440,9 +1440,9 @@
 void UISession::cleanup()
 {
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Destroy alpha cursor: */
     if (m_alphaCursor)
         DestroyIcon(m_alphaCursor);
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* Save settings: */
@@ -1465,5 +1465,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UISession::updateMenu()
 {
@@ -1479,5 +1479,5 @@
     }
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /** Generate a BGRA bitmap which approximates a XOR/AND mouse pointer.
@@ -1589,5 +1589,5 @@
     uint srcShapePtrScan = uWidth * 4;
 
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
 
     BITMAPV5HEADER bi;
@@ -1719,5 +1719,5 @@
         DeleteObject(hBitmap);
 
-#elif defined(Q_WS_X11) || defined(Q_WS_MAC)
+#elif defined(VBOX_WS_X11) || defined(VBOX_WS_MAC)
 
     /* Create a ARGB image out of the shape data: */
@@ -1737,5 +1737,5 @@
     /* Create cursor-pixmap from the image: */
     QPixmap cursorPixmap = QPixmap::fromImage(image);
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  ifdef VBOX_GUI_WITH_HIDPI
     /* Adjust backing-scale-factor: */
@@ -1749,5 +1749,5 @@
         cursorPixmap.setDevicePixelRatio(dBackingScaleFactor);
 #  endif /* VBOX_GUI_WITH_HIDPI */
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
     /* Set the new cursor: */
     m_cursor = QCursor(cursorPixmap, uXHot, uYHot);
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h	(revision 60362)
@@ -49,9 +49,9 @@
 class CNetworkAdapter;
 class CMediumAttachment;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 class QMenuBar;
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
 class QIcon;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 /* CConsole callback event types: */
@@ -127,5 +127,5 @@
     QCursor cursor() const { return m_cursor; }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** @name Branding stuff.
      ** @{ */
@@ -135,5 +135,5 @@
     QString machineWindowNamePostfix() const { return m_strMachineWindowNamePostfix; }
     /** @} */
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /** @name Host-screen configuration variables.
@@ -388,8 +388,8 @@
     void cleanup();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Updates menu-bar content. */
     void updateMenu();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Common helpers: */
@@ -434,8 +434,8 @@
     UIActionPool *m_pActionPool;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Holds the menu-bar instance. */
     QMenuBar *m_pMenuBar;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Screen visibility vector: */
@@ -456,5 +456,5 @@
     QCursor m_cursor;
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** @name Branding variables.
      ** @{ */
@@ -464,5 +464,5 @@
     QString m_strMachineWindowNamePostfix;
     /** @} */
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /** @name Visual-state configuration variables.
@@ -472,5 +472,5 @@
     /** @} */
 
-#if defined(Q_WS_WIN)
+#if defined(VBOX_WS_WIN)
     HCURSOR m_alphaCursor;
 #endif
@@ -480,8 +480,8 @@
     /** Holds the list of host-screen geometries we currently have. */
     QList<QRect> m_hostScreens;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Watchdog timer looking for display reconfiguration. */
     QTimer *m_pWatchdogDisplayChange;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** @} */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISlidingToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISlidingToolBar.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISlidingToolBar.cpp	(revision 60362)
@@ -30,7 +30,7 @@
 # include "UIAnimationFramework.h"
 # include "UIMachineWindow.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils-darwin.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -71,5 +71,5 @@
     setAttribute(Qt::WA_DeleteOnClose);
 
-#if   defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if   defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
     /* Make sure we have no background
      * until the first one paint-event: */
@@ -77,5 +77,5 @@
     /* Use Qt API to enable translucency: */
     setAttribute(Qt::WA_TranslucentBackground);
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
     if (vboxGlobal().isCompositingManagerRunning())
     {
@@ -83,5 +83,5 @@
         setAttribute(Qt::WA_TranslucentBackground);
     }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Prepare contents: */
@@ -154,5 +154,5 @@
     }
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     if (!vboxGlobal().isCompositingManagerRunning())
     {
@@ -160,10 +160,10 @@
         setMask(m_pEmbeddedWidget->geometry());
     }
-#endif /* Q_WS_X11 */
-
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_X11 */
+
+#ifdef VBOX_WS_WIN
     /* Raise tool-window for proper z-order. */
     raise();
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /* Activate window after it was shown: */
@@ -211,5 +211,5 @@
     m_pEmbeddedWidget->setGeometry(0, 0, qMax(width(), sh.width()), sh.height());
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     if (!vboxGlobal().isCompositingManagerRunning())
     {
@@ -217,10 +217,10 @@
         setMask(m_pEmbeddedWidget->geometry());
     }
-#endif /* Q_WS_X11 */
-
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_X11 */
+
+#ifdef VBOX_WS_WIN
     /* Raise tool-window for proper z-order. */
     raise();
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 }
 
@@ -274,5 +274,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 bool UISlidingToolBar::event(QEvent *pEvent)
 {
@@ -296,5 +296,5 @@
     return QWidget::event(pEvent);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UISlidingToolBar::setWidgetGeometry(const QRect &rect)
@@ -303,5 +303,5 @@
     m_pEmbeddedWidget->setGeometry(rect);
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     if (!vboxGlobal().isCompositingManagerRunning())
     {
@@ -309,5 +309,5 @@
         setMask(m_pEmbeddedWidget->geometry());
     }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISlidingToolBar.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISlidingToolBar.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISlidingToolBar.h	(revision 60362)
@@ -94,8 +94,8 @@
     /** Close event handler. */
     virtual void closeEvent(QCloseEvent *pEvent);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Common event handler. */
     virtual bool event(QEvent *pEvent);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** Defines mdi-sub-window geometry. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp	(revision 60362)
@@ -532,7 +532,7 @@
     color1.setAlpha(0);
     QColor color2 = pal.color(QPalette::Window).darker(200);
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     QColor color3 = pal.color(QPalette::Window).darker(120);
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
     /* Left corner: */
@@ -575,5 +575,5 @@
     painter.fillRect(QRect(width() - 5, 5, 5, height() - 5), grad5); // right line
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /* Paint frames: */
     painter.save();
@@ -584,5 +584,5 @@
     painter.drawLine(QLine(QPoint(5 + 1, height() - 1),               QPoint(5 + 1, 5 + 1)));
     painter.restore();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
     /* Paint drop token: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp	(revision 60362)
@@ -259,9 +259,9 @@
                     m_pDiscardCheckBox = new QCheckBox(this);
                     /* Configure layout: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                     pChoiceLayout->setSpacing(15);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
                     pChoiceLayout->setSpacing(6);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
                     pChoiceLayout->setContentsMargins(0, 0, 0, 0);
                     pChoiceLayout->addWidget(m_pDetachIcon, 0, 0);
@@ -276,9 +276,9 @@
                 }
                 /* Configure layout: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                 pTopRightLayout->setSpacing(15);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
                 pTopRightLayout->setSpacing(6);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
                 pTopRightLayout->setContentsMargins(0, 0, 0, 0);
                 pTopRightLayout->addWidget(m_pLabel);
@@ -302,7 +302,7 @@
         /* Configure layout: */
         pMainLayout->setSpacing(20);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         pMainLayout->setContentsMargins(40, 20, 40, 20);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         pMainLayout->addItem(pTopLayout);
         pMainLayout->addWidget(pButtonBox);
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp	(revision 60362)
@@ -34,5 +34,5 @@
 # include "UIMachineView.h"
 # include "QIMenu.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "UICocoaApplication.h"
 #  include "UIExtraDataManager.h"
@@ -40,5 +40,5 @@
 #  include "UIFrameBuffer.h"
 #  include <Carbon/Carbon.h>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -48,7 +48,7 @@
     : UIMachineLogic(pParent, pSession, UIVisualStateType_Fullscreen)
     , m_pPopupMenu(0)
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     , m_fScreensHaveSeparateSpaces(darwinScreensHaveSeparateSpaces())
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 {
     /* Create multiscreen layout: */
@@ -92,10 +92,10 @@
 {
     Q_UNUSED(uScreenId);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     return vboxGlobal().osRelease() <= MacOSXRelease_Lion ? Qt::FramelessWindowHint :
            uScreenId == 0 || screensHaveSeparateSpaces() ? Qt::Window : Qt::FramelessWindowHint;
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     return Qt::FramelessWindowHint;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -107,5 +107,5 @@
     m_pScreenLayout->rebuild();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* For Lion and previous: */
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
@@ -117,9 +117,9 @@
     /* For ML and next revalidate native fullscreen: */
     else revalidateNativeFullScreen();
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     /* Make sure all machine-window(s) have proper geometry: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->showInNecessaryMode();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -396,5 +396,5 @@
     LogRel(("GUI: UIMachineLogicFullscreen::sltScreenLayoutChanged: Multi-screen layout changed\n"));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* For Lion and previous: */
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
@@ -406,9 +406,9 @@
     /* Revalidate native fullscreen for ML and next: */
     else revalidateNativeFullScreen();
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     /* Make sure all machine-window(s) have proper geometry: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->showInNecessaryMode();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -420,5 +420,5 @@
     m_pScreenLayout->rebuild();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Call to base-class for Lion and previous: */
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
@@ -426,8 +426,8 @@
     /* Revalidate native fullscreen for ML and next: */
     else revalidateNativeFullScreen();
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     /* Call to base-class: */
     UIMachineLogic::sltGuestMonitorChange(changeType, uScreenId, screenGeo);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -439,5 +439,5 @@
     m_pScreenLayout->rebuild();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Call to base-class for Lion and previous: */
     if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
@@ -445,8 +445,8 @@
     /* Revalidate native fullscreen for ML and next: */
     else revalidateNativeFullScreen();
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     /* Call to base-class: */
     UIMachineLogic::sltHostScreenCountChange();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -478,9 +478,9 @@
                                                           UIExtraDataMetaDefs::RuntimeMenuViewActionType_StatusBar |
                                                           UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Restrict 'Window' menu: */
     actionPool()->toRuntime()->setRestrictionForMenuBar(UIActionRestrictionLevel_Logic,
                                                         UIExtraDataMetaDefs::MenuType_Window);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Take care of view-action toggle state: */
@@ -514,5 +514,5 @@
         return;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* For ML and next: */
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
@@ -528,5 +528,5 @@
      * This is necessary for Qt versions > 4.3.3: */
     darwinSetFrontMostProcess();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Update the multi-screen layout: */
@@ -547,5 +547,5 @@
             this, SLOT(sltScreenLayoutChanged()));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* For ML and next: */
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
@@ -579,10 +579,10 @@
         revalidateNativeFullScreen();
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Mark machine-window(s) created: */
     setMachineWindowsCreated(true);
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     switch (vboxGlobal().typeOfWindowManager())
     {
@@ -600,5 +600,5 @@
             break;
     }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 }
 
@@ -628,5 +628,5 @@
         return;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* For ML and next: */
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
@@ -636,5 +636,5 @@
         UICocoaApplication::instance()->unregisterFromNotificationOfWorkspace("NSWorkspaceActiveSpaceDidChangeNotification", this);
     }
-#endif/* Q_WS_MAC */
+#endif/* VBOX_WS_MAC */
 
     /* Mark machine-window(s) destroyed: */
@@ -674,9 +674,9 @@
     actionPool()->toRuntime()->setRestrictionForMenuView(UIActionRestrictionLevel_Logic,
                                                          UIExtraDataMetaDefs::RuntimeMenuViewActionType_Invalid);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Allow 'Window' menu: */
     actionPool()->toRuntime()->setRestrictionForMenuBar(UIActionRestrictionLevel_Logic,
                                                         UIExtraDataMetaDefs::MenuType_Invalid);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Call to base-class: */
@@ -684,5 +684,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineLogicFullscreen::revalidateNativeFullScreen(UIMachineWindow *pMachineWindow)
 {
@@ -882,4 +882,4 @@
             revalidateNativeFullScreen(pMachineWindow);
 }
-#endif /* Q_WS_MAC */
-
+#endif /* VBOX_WS_MAC */
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.h	(revision 60362)
@@ -23,7 +23,7 @@
 
 /* Other includes: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # include <ApplicationServices/ApplicationServices.h>
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* Forward declarations: */
@@ -44,10 +44,10 @@
 #endif /* RT_OS_DARWIN */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 public:
 
     /** Returns whether screens have separate spaces. */
     bool screensHaveSeparateSpaces() const { return m_fScreensHaveSeparateSpaces; }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 protected:
@@ -127,5 +127,5 @@
     void cleanupActionGroups();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Revalidates 'fullscreen' mode for @a pMachineWindow. */
     void revalidateNativeFullScreen(UIMachineWindow *pMachineWindow);
@@ -142,5 +142,5 @@
     /** Mac OS X: Handles native notification about active space change. */
     void nativeHandlerForActiveSpaceChange(const QMap<QString, QString> &userInfo);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** Holds the popup-menu instance. */
@@ -150,5 +150,5 @@
     UIMultiScreenLayout *m_pScreenLayout;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Holds whether screens have separate spaces. */
     const bool m_fScreensHaveSeparateSpaces;
@@ -158,5 +158,5 @@
     /** Mac OS X: Contains machine-window(s) marked as 'invalid fullscreen'. */
     QSet<UIMachineWindow*> m_invalidFullscreenMachineWindows;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Friend classes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp	(revision 60362)
@@ -24,7 +24,7 @@
 # include <QMainWindow>
 # include <QTimer>
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <QMenuBar>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -40,7 +40,7 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # include <limits.h>
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp	(revision 60362)
@@ -32,12 +32,12 @@
 # include "UIMachineWindowFullscreen.h"
 # include "UIMachineView.h"
-# if   defined(Q_WS_WIN) || defined(Q_WS_X11)
+# if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 #  include "UIMachineDefs.h"
 #  include "UIMiniToolBar.h"
-# elif defined(Q_WS_MAC)
+# elif defined(VBOX_WS_MAC)
 #  include "UIFrameBuffer.h"
 #  include "VBoxUtils-darwin.h"
 #  include "UICocoaApplication.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -49,14 +49,14 @@
 UIMachineWindowFullscreen::UIMachineWindowFullscreen(UIMachineLogic *pMachineLogic, ulong uScreenId)
     : UIMachineWindow(pMachineLogic, uScreenId)
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     , m_pMiniToolBar(0)
-#endif /* Q_WS_WIN || Q_WS_X11 */
-#ifdef Q_WS_MAC
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+#ifdef VBOX_WS_MAC
     , m_fIsInFullscreenTransition(false)
-#endif /* Q_WS_MAC */
-{
-}
-
-#ifdef Q_WS_MAC
+#endif /* VBOX_WS_MAC */
+{
+}
+
+#ifdef VBOX_WS_MAC
 void UIMachineWindowFullscreen::handleNativeNotification(const QString &strNativeNotificationName)
 {
@@ -114,7 +114,7 @@
     }
 }
-#endif /* Q_WS_MAC */
-
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#endif /* VBOX_WS_MAC */
+
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 void UIMachineWindowFullscreen::sltMachineStateChanged()
 {
@@ -133,12 +133,12 @@
 
     /* Revoke stolen activation: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     raise();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     activateWindow();
 }
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-#ifdef Q_WS_MAC
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+#ifdef VBOX_WS_MAC
 void UIMachineWindowFullscreen::sltEnterNativeFullscreen(UIMachineWindow *pMachineWindow)
 {
@@ -189,5 +189,5 @@
         darwinToggleFullscreenMode(this);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineWindowFullscreen::prepareVisualState()
@@ -203,10 +203,10 @@
     setAutoFillBackground(true);
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /* Prepare mini-toolbar: */
     prepareMiniToolbar();
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-#ifdef Q_WS_MAC
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+#ifdef VBOX_WS_MAC
     /* Native fullscreen stuff on ML and next: */
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
@@ -233,8 +233,8 @@
                                                                        UIMachineWindow::handleNativeNotification);
 }
-#endif /* Q_WS_MAC */
-}
-
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#endif /* VBOX_WS_MAC */
+}
+
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 void UIMachineWindowFullscreen::prepareMiniToolbar()
 {
@@ -260,5 +260,5 @@
         connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutWindowActivationStolen()),
                 this, SLOT(sltRevokeWindowActivation()), Qt::QueuedConnection);
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
         // WORKAROUND:
         // Due to Unity bug we want native full-screen flag to be set
@@ -267,10 +267,10 @@
         if (vboxGlobal().typeOfWindowManager() == X11WMType_Compiz)
             vboxGlobal().setFullScreenFlag(m_pMiniToolBar);
-# endif /* Q_WS_X11 */
-    }
-}
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+# endif /* VBOX_WS_X11 */
+    }
+}
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 void UIMachineWindowFullscreen::cleanupMiniToolbar()
 {
@@ -285,9 +285,9 @@
     m_pMiniToolBar = 0;
 }
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 void UIMachineWindowFullscreen::cleanupVisualState()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Native fullscreen stuff on ML and next: */
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
@@ -300,10 +300,10 @@
         UICocoaApplication::instance()->unregisterFromNotificationOfWindow("NSWindowDidFailToEnterFullScreenNotification", this);
     }
-#endif /* Q_WS_MAC */
-
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#endif /* VBOX_WS_MAC */
+
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /* Cleanup mini-toolbar: */
     cleanupMiniToolbar();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
     /* Call to base-class: */
@@ -318,5 +318,5 @@
     const QRect workingArea = vboxGlobal().screenGeometry(iHostScreen);
 
-#if   defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /* Set appropriate geometry for window: */
     resize(workingArea.size());
@@ -330,5 +330,5 @@
         m_pMiniToolBar->move(workingArea.topLeft());
     }
-#elif defined(Q_WS_MAC)
+#elif defined(VBOX_WS_MAC)
     /* Make sure this window has fullscreen logic: */
     UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
@@ -362,5 +362,5 @@
         setGeometry(geo);
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -375,5 +375,5 @@
         !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
         /* If there is a mini-toolbar: */
         if (m_pMiniToolBar)
@@ -382,5 +382,5 @@
             m_pMiniToolBar->hide();
         }
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
         /* Hide window: */
@@ -393,5 +393,5 @@
             return;
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         /* If WM doesn't support native stuff, we need to call for placeOnScreen(): */
         const bool fSupportsNativeFullScreen = VBoxGlobal::supportsFullScreenMonitorsProtocolX11() &&
@@ -402,10 +402,10 @@
             placeOnScreen();
         }
-#else /* !Q_WS_X11 */
+#else /* !VBOX_WS_X11 */
         /* Make sure window have appropriate geometry: */
         placeOnScreen();
-#endif /* !Q_WS_X11 */
-
-#if defined(Q_WS_MAC)
+#endif /* !VBOX_WS_X11 */
+
+#if defined(VBOX_WS_MAC)
         /* ML and next using native stuff, so we can call for simple show(),
          * Lion and previous using Qt stuff, so we should call for showFullScreen(): */
@@ -421,5 +421,5 @@
             showFullScreen();
         }
-#elif defined(Q_WS_WIN) || defined(Q_WS_X11)
+#elif defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
         /* Show window in fullscreen mode: */
         showFullScreen();
@@ -431,7 +431,7 @@
             m_pMiniToolBar->showFullScreen();
         }
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-#ifdef Q_WS_X11
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+#ifdef VBOX_WS_X11
         /* If WM supports native stuff, we need to map window to corresponding host-screen. */
         if (fSupportsNativeFullScreen)
@@ -447,5 +447,5 @@
             }
         }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
         /* Adjust machine-view size if necessary: */
@@ -457,5 +457,5 @@
 }
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 void UIMachineWindowFullscreen::updateAppearanceOf(int iElement)
 {
@@ -481,7 +481,7 @@
     }
 }
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+#ifdef VBOX_WS_WIN
 # if QT_VERSION >= 0x050000
 void UIMachineWindowFullscreen::showEvent(QShowEvent *pEvent)
@@ -497,4 +497,4 @@
 }
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_WIN */
-
+#endif /* VBOX_WS_WIN */
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h	(revision 60362)
@@ -22,8 +22,8 @@
 #include "UIMachineWindow.h"
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 /* Forward declarations: */
 class UIMiniToolBar;
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 /** UIMachineWindow reimplementation,
@@ -52,14 +52,14 @@
     UIMachineWindowFullscreen(UIMachineLogic *pMachineLogic, ulong uScreenId);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Handles native notifications @a strNativeNotificationName for 'fullscreen' window. */
     void handleNativeNotification(const QString &strNativeNotificationName);
     /** Mac OS X: Returns whether window is in 'fullscreen' transition. */
     bool isInFullscreenTransition() const { return m_fIsInFullscreenTransition; }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 private slots:
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Handles machine state change event. */
     void sltMachineStateChanged();
@@ -67,5 +67,5 @@
     /** Revokes window activation. */
     void sltRevokeWindowActivation();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 #ifdef RT_OS_DARWIN
@@ -80,13 +80,13 @@
     /** Prepare visual-state routine. */
     void prepareVisualState();
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Prepare mini-toolbar routine. */
     void prepareMiniToolbar();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Cleanup mini-toolbar routine. */
     void cleanupMiniToolbar();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
     /** Cleanup visual-state routine. */
     void cleanupVisualState();
@@ -97,27 +97,27 @@
     void showInNecessaryMode();
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Common update routine. */
     void updateAppearanceOf(int iElement);
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 # if QT_VERSION >= 0x050000
     /** Win: Handles show @a pEvent. */
     void showEvent(QShowEvent *pEvent);
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Holds the mini-toolbar instance. */
     UIMiniToolBar *m_pMiniToolBar;
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Reflects whether window is in 'fullscreen' transition. */
     bool m_fIsInFullscreenTransition;
     /** Mac OS X: Allows 'fullscreen' API access: */
     friend class UIMachineLogicFullscreen;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** Factory support. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp	(revision 60362)
@@ -139,10 +139,10 @@
             if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
             {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                 QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
                 m_geometry.moveTo(pMoveEvent->pos());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
                 m_geometry.moveTo(geometry().x(), geometry().y());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             }
             break;
@@ -177,11 +177,11 @@
     connect(m_pMachineWindow, SIGNAL(destroyed(QObject*)), this, SLOT(suicide()));
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* No window-icon on Mac OX X, because it acts as proxy icon which isn't necessary here. */
     setWindowIcon(QIcon());
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     /* Assign window-icon(s: */
     setWindowIcon(UIIconPool::iconSetFull(":/session_info_32px.png", ":/session_info_16px.png"));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Prepare central-widget: */
@@ -277,10 +277,10 @@
         /* Load geometry: */
         m_geometry = gEDataManager->informationWindowGeometry(this, m_pMachineWindow, vboxGlobal().managedVMUuid());
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         move(m_geometry.topLeft());
         resize(m_geometry.size());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         setGeometry(m_geometry);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIVMInformationDialog: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
@@ -297,9 +297,9 @@
     {
         /* Save geometry: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         gEDataManager->setInformationWindowGeometry(m_geometry, ::darwinIsWindowMaximized(this), vboxGlobal().managedVMUuid());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         gEDataManager->setInformationWindowGeometry(m_geometry, isMaximized(), vboxGlobal().managedVMUuid());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UIVMInformationDialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp	(revision 60362)
@@ -21,18 +21,18 @@
 
 /* Qt includes: */
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include <QMainWindow>
 #  include <QMenuBar>
 #  include <QKeyEvent>
 #  include <QTimer>
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
 # include "UIKeyboardHandlerNormal.h"
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include "UIMachineLogic.h"
 #  include "UIMachineWindow.h"
 #  include "UIShortcutPool.h"
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -40,7 +40,7 @@
 
 /* Namespaces: */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 using namespace UIExtraDataDefs;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 UIKeyboardHandlerNormal::UIKeyboardHandlerNormal(UIMachineLogic* pMachineLogic)
@@ -53,5 +53,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 bool UIKeyboardHandlerNormal::eventFilter(QObject *pWatchedObject, QEvent *pEvent)
 {
@@ -91,9 +91,9 @@
                                 /* Activate 'active' menu-bar action: */
                                 pMenuBar->activeAction()->activate(QAction::Trigger);
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
                                 /* Windows host needs separate 'focus set'
                                  * to let menubar operate while popped up: */
                                 pMenuBar->setFocus();
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
                             }
                         }
@@ -117,4 +117,4 @@
     return UIKeyboardHandler::eventFilter(pWatchedObject, pEvent);
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.h	(revision 60362)
@@ -37,8 +37,8 @@
 private:
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** General event-filter. */
     bool eventFilter(QObject *pWatched, QEvent *pEvent);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Friend class: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp	(revision 60362)
@@ -21,7 +21,7 @@
 
 /* Qt includes: */
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include <QTimer>
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -36,9 +36,9 @@
 # include "UIExtraDataManager.h"
 # include "UIFrameBuffer.h"
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include "QIMenu.h"
-# else  /* Q_WS_MAC */
+# else  /* VBOX_WS_MAC */
 #  include "VBoxUtils.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -51,7 +51,7 @@
 UIMachineLogicNormal::UIMachineLogicNormal(QObject *pParent, UISession *pSession)
     : UIMachineLogic(pParent, pSession, UIVisualStateType_Normal)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     , m_pPopupMenu(0)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 {
 }
@@ -117,15 +117,15 @@
     AssertReturnVoid(isMachineWindowsCreated());
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Make sure menu-bar is enabled: */
     const bool fEnabled = actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->isChecked();
     AssertReturnVoid(fEnabled);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Prevent user from opening another one editor or toggle menu-bar: */
     actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings)->setEnabled(false);
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->setEnabled(false);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     /* Create menu-bar editor: */
     UIMenuBarEditorWindow *pMenuBarEditor = new UIMenuBarEditorWindow(activeMachineWindow(), actionPool());
@@ -135,8 +135,8 @@
         connect(pMenuBarEditor, SIGNAL(destroyed(QObject*)),
                 this, SLOT(sltMenuBarSettingsClosed()));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         connect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
                 pMenuBarEditor, SLOT(sltActivateWindow()));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         /* Show window: */
         pMenuBarEditor->show();
@@ -146,15 +146,15 @@
 void UIMachineLogicNormal::sltMenuBarSettingsClosed()
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Make sure menu-bar is enabled: */
     const bool fEnabled = actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->isChecked();
     AssertReturnVoid(fEnabled);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Allow user to open editor and toggle menu-bar again: */
     actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings)->setEnabled(true);
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->setEnabled(true);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -190,8 +190,8 @@
         connect(pStatusBarEditor, SIGNAL(destroyed(QObject*)),
                 this, SLOT(sltStatusBarSettingsClosed()));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         connect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
                 pStatusBarEditor, SLOT(sltActivateWindow()));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         /* Show window: */
         pStatusBarEditor->show();
@@ -265,8 +265,8 @@
     connect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings), SIGNAL(triggered(bool)),
             this, SLOT(sltOpenMenuBarSettings()));
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     connect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility), SIGNAL(triggered(bool)),
             this, SLOT(sltToggleMenuBar()));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings), SIGNAL(triggered(bool)),
             this, SLOT(sltOpenStatusBarSettings()));
@@ -285,9 +285,9 @@
         return;
 
-#ifdef Q_WS_MAC // TODO: Is that really need here?
+#ifdef VBOX_WS_MAC // TODO: Is that really need here?
     /* We have to make sure that we are getting the front most process.
      * This is necessary for Qt versions > 4.3.3: */
     ::darwinSetFrontMostProcess();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Get monitors count: */
@@ -310,5 +310,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 void UIMachineLogicNormal::prepareMenu()
 {
@@ -322,7 +322,7 @@
     }
 }
-#endif /* !Q_WS_MAC */
-
-#ifndef Q_WS_MAC
+#endif /* !VBOX_WS_MAC */
+
+#ifndef VBOX_WS_MAC
 void UIMachineLogicNormal::cleanupMenu()
 {
@@ -331,5 +331,5 @@
     m_pPopupMenu = 0;
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 void UIMachineLogicNormal::cleanupMachineWindows()
@@ -358,8 +358,8 @@
     disconnect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings), SIGNAL(triggered(bool)),
                this, SLOT(sltOpenMenuBarSettings()));
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     disconnect(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility), SIGNAL(triggered(bool)),
                this, SLOT(sltToggleMenuBar()));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     disconnect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings), SIGNAL(triggered(bool)),
                this, SLOT(sltOpenStatusBarSettings()));
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h	(revision 60362)
@@ -74,19 +74,19 @@
     void prepareActionConnections();
     void prepareMachineWindows();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     void prepareMenu();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Cleanup helpers: */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     void cleanupMenu();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     void cleanupMachineWindows();
     void cleanupActionConnections();
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** Holds the popup-menu instance. */
     QMenu *m_pPopupMenu;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Friend classes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp	(revision 60362)
@@ -100,8 +100,8 @@
     UIMachineView::prepareFilters();
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Install menu-bar event-filter: */
     machineWindow()->menuBar()->installEventFilter(this);
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp	(revision 60362)
@@ -40,11 +40,11 @@
 # include "QIStatusBar.h"
 # include "QIStatusBarIndicator.h"
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include "UIMenuBar.h"
-# else  /* Q_WS_MAC */
+# else  /* VBOX_WS_MAC */
 #  include "VBoxUtils.h"
 #  include "UIImageTools.h"
 #  include "UICocoaApplication.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -239,5 +239,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 void UIMachineWindowNormal::prepareMenu()
 {
@@ -256,5 +256,5 @@
     }
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 void UIMachineWindowNormal::prepareStatusBar()
@@ -286,8 +286,8 @@
     }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* For the status-bar on Cocoa: */
     setUnifiedTitleAndToolBarOnMac(true);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -306,5 +306,5 @@
 #endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Beta label? */
     if (vboxGlobal().isBeta())
@@ -324,5 +324,5 @@
                                                                                 UIMachineWindow::handleStandardWindowButtonCallback);
     }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -334,8 +334,8 @@
     /* Load GUI customizations: */
     {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Update menu-bar visibility: */
         menuBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->isChecked());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /* Update status-bar visibility: */
         statusBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked());
@@ -390,9 +390,9 @@
 
         /* Normalize to the optimal size: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
         QTimer::singleShot(0, this, SLOT(sltNormalizeGeometry()));
-#else /* !Q_WS_X11 */
+#else /* !VBOX_WS_X11 */
         normalizeGeometry(true /* adjust position */);
-#endif /* !Q_WS_X11 */
+#endif /* !VBOX_WS_X11 */
     }
 }
@@ -413,9 +413,9 @@
 void UIMachineWindowNormal::cleanupVisualState()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Unregister 'Zoom' button from using our full-screen since Yosemite: */
     if (vboxGlobal().osRelease() >= MacOSXRelease_Yosemite)
         UICocoaApplication::instance()->unregisterCallbackForStandardWindowButton(this, StandardWindowButtonType_Zoom);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -572,5 +572,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 void UIMachineWindowNormal::updateMenu()
 {
@@ -580,15 +580,15 @@
         menuBar()->addMenu(pMenu);
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 bool UIMachineWindowNormal::isMaximizedChecked()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* On the Mac the WindowStateChange signal doesn't seems to be delivered
      * when the user get out of the maximized state. So check this ourself. */
     return ::darwinIsWindowMaximized(this);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     return isMaximized();
-#endif /* !Q_WS_MAC */
-}
-
+#endif /* !VBOX_WS_MAC */
+}
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h	(revision 60362)
@@ -44,8 +44,8 @@
 private slots:
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /** X11: Performs machine-window async geometry normalization. */
     void sltNormalizeGeometry() { normalizeGeometry(true /* adjust position */); }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /** Handles machine state change event. */
@@ -86,8 +86,8 @@
     /** Prepare session connections routine. */
     void prepareSessionConnections();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** Prepare menu routine. */
     void prepareMenu();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     /** Prepare status-bar routine. */
     void prepareStatusBar();
@@ -113,8 +113,8 @@
     void updateAppearanceOf(int aElement);
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** Updates menu-bar content. */
     void updateMenu();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /** Common @a pEvent handler. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp	(revision 60362)
@@ -21,23 +21,23 @@
 
 /* Qt includes: */
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include <QKeyEvent>
 #  include <QTimer>
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
 # include "UIKeyboardHandlerScale.h"
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include "UIMachineLogic.h"
 #  include "UIShortcutPool.h"
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 /* Namespaces: */
 using namespace UIExtraDataDefs;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 UIKeyboardHandlerScale::UIKeyboardHandlerScale(UIMachineLogic* pMachineLogic)
@@ -50,5 +50,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 bool UIKeyboardHandlerScale::eventFilter(QObject *pWatchedObject, QEvent *pEvent)
 {
@@ -84,4 +84,4 @@
     return UIKeyboardHandler::eventFilter(pWatchedObject, pEvent);
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.h	(revision 60362)
@@ -37,8 +37,8 @@
 private:
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** General event-filter. */
     bool eventFilter(QObject *pWatched, QEvent *pEvent);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Friend class: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp	(revision 60362)
@@ -21,7 +21,7 @@
 
 /* Qt includes: */
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include <QTimer>
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -33,9 +33,9 @@
 # include "UIMachineWindow.h"
 # include "UIShortcutPool.h"
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include "QIMenu.h"
-# else  /* Q_WS_MAC */
+# else  /* VBOX_WS_MAC */
 #  include "VBoxUtils.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -44,7 +44,7 @@
 UIMachineLogicScale::UIMachineLogicScale(QObject *pParent, UISession *pSession)
     : UIMachineLogic(pParent, pSession, UIVisualStateType_Scale)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     , m_pPopupMenu(0)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 {
 }
@@ -63,5 +63,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 void UIMachineLogicScale::sltInvokePopupMenu()
 {
@@ -73,5 +73,5 @@
     }
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 void UIMachineLogicScale::prepareActionGroups()
@@ -120,9 +120,9 @@
         return;
 
-#ifdef Q_WS_MAC // TODO: Is that really need here?
+#ifdef VBOX_WS_MAC // TODO: Is that really need here?
     /* We have to make sure that we are getting the front most process.
      * This is necessary for Qt versions > 4.3.3: */
     ::darwinSetFrontMostProcess();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Get monitors count: */
@@ -145,5 +145,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 void UIMachineLogicScale::prepareMenu()
 {
@@ -157,7 +157,7 @@
     }
 }
-#endif /* !Q_WS_MAC */
-
-#ifndef Q_WS_MAC
+#endif /* !VBOX_WS_MAC */
+
+#ifndef VBOX_WS_MAC
 void UIMachineLogicScale::cleanupMenu()
 {
@@ -166,5 +166,5 @@
     m_pPopupMenu = 0;
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 void UIMachineLogicScale::cleanupMachineWindows()
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp	(revision 60362)
@@ -33,9 +33,9 @@
 # include "UIMachineWindowScale.h"
 # include "UIMachineView.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils.h"
 #  include "UIImageTools.h"
 #  include "UICocoaApplication.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -59,5 +59,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineWindowScale::prepareVisualState()
 {
@@ -83,5 +83,5 @@
     }
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineWindowScale::loadSettings()
@@ -138,5 +138,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIMachineWindowScale::cleanupVisualState()
 {
@@ -145,5 +145,5 @@
         UICocoaApplication::instance()->unregisterCallbackForStandardWindowButton(this, StandardWindowButtonType_Zoom);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIMachineWindowScale::showInNecessaryMode()
@@ -199,5 +199,5 @@
 }
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 # if QT_VERSION < 0x050000
 bool UIMachineWindowScale::winEvent(MSG *pMessage, long *pResult)
@@ -246,15 +246,15 @@
 }
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 bool UIMachineWindowScale::isMaximizedChecked()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* On the Mac the WindowStateChange signal doesn't seems to be delivered
      * when the user get out of the maximized state. So check this ourself. */
     return ::darwinIsWindowMaximized(this);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     return isMaximized();
-#endif /* !Q_WS_MAC */
-}
-
+#endif /* !VBOX_WS_MAC */
+}
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.h	(revision 60362)
@@ -37,8 +37,8 @@
     /** Prepare main-layout routine. */
     void prepareMainLayout();
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Prepare visual-state routine. */
     void prepareVisualState();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** Load settings routine. */
     void loadSettings();
@@ -46,8 +46,8 @@
     /** Save settings routine. */
     void saveSettings();
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Cleanup visual-state routine. */
     void cleanupVisualState();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /** Updates visibility according to visual-state. */
@@ -56,10 +56,10 @@
     /** Common @a pEvent handler. */
     bool event(QEvent *pEvent);
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 # if QT_VERSION < 0x050000
     /** Qt4: Win: Handles all native messages. */
     bool winEvent(MSG *pMessage, long *pResult);
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     /** Returns whether this window is maximized. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp	(revision 60362)
@@ -20,24 +20,24 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 /* Qt includes: */
 #  include <QKeyEvent>
 #  include <QTimer>
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
 # include "UIKeyboardHandlerSeamless.h"
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include "UIMachineLogic.h"
 #  include "UIShortcutPool.h"
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 /* Namespaces: */
 using namespace UIExtraDataDefs;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 UIKeyboardHandlerSeamless::UIKeyboardHandlerSeamless(UIMachineLogic* pMachineLogic)
@@ -50,5 +50,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 bool UIKeyboardHandlerSeamless::eventFilter(QObject *pWatchedObject, QEvent *pEvent)
 {
@@ -84,4 +84,4 @@
     return UIKeyboardHandler::eventFilter(pWatchedObject, pEvent);
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.h	(revision 60362)
@@ -37,8 +37,8 @@
 private:
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** General event-filter. */
     bool eventFilter(QObject *pWatched, QEvent *pEvent);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Friend class: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp	(revision 60362)
@@ -21,7 +21,7 @@
 
 /* Qt includes: */
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include <QTimer>
-# endif /* !Q_WS_MAC */
+# endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -35,9 +35,9 @@
 # include "UIMultiScreenLayout.h"
 # include "UIShortcutPool.h"
-# ifndef Q_WS_MAC
+# ifndef VBOX_WS_MAC
 #  include "QIMenu.h"
-# else  /* Q_WS_MAC */
+# else  /* VBOX_WS_MAC */
 #  include "VBoxUtils.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -46,7 +46,7 @@
 UIMachineLogicSeamless::UIMachineLogicSeamless(QObject *pParent, UISession *pSession)
     : UIMachineLogic(pParent, pSession, UIVisualStateType_Seamless)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     , m_pPopupMenu(0)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 {
     /* Create multiscreen layout: */
@@ -164,5 +164,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 void UIMachineLogicSeamless::sltInvokePopupMenu()
 {
@@ -174,5 +174,5 @@
     }
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 void UIMachineLogicSeamless::sltScreenLayoutChanged()
@@ -230,9 +230,9 @@
                                                           UIExtraDataMetaDefs::RuntimeMenuViewActionType_StatusBar |
                                                           UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Restrict 'Window' menu: */
     actionPool()->toRuntime()->setRestrictionForMenuBar(UIActionRestrictionLevel_Logic,
                                                         UIExtraDataMetaDefs::MenuType_Window);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Take care of view-action toggle state: */
@@ -266,9 +266,9 @@
         return;
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* We have to make sure that we are getting the front most process.
      * This is necessary for Qt versions > 4.3.3: */
     darwinSetFrontMostProcess();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Update the multi-screen layout: */
@@ -292,5 +292,5 @@
     setMachineWindowsCreated(true);
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     switch (vboxGlobal().typeOfWindowManager())
     {
@@ -308,8 +308,8 @@
             break;
     }
-#endif /* Q_WS_X11 */
-}
-
-#ifndef Q_WS_MAC
+#endif /* VBOX_WS_X11 */
+}
+
+#ifndef VBOX_WS_MAC
 void UIMachineLogicSeamless::prepareMenu()
 {
@@ -323,7 +323,7 @@
     }
 }
-#endif /* !Q_WS_MAC */
-
-#ifndef Q_WS_MAC
+#endif /* !VBOX_WS_MAC */
+
+#ifndef VBOX_WS_MAC
 void UIMachineLogicSeamless::cleanupMenu()
 {
@@ -332,5 +332,5 @@
     m_pPopupMenu = 0;
 }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 void UIMachineLogicSeamless::cleanupMachineWindows()
@@ -376,9 +376,9 @@
     actionPool()->toRuntime()->setRestrictionForMenuView(UIActionRestrictionLevel_Logic,
                                                          UIExtraDataMetaDefs::RuntimeMenuViewActionType_Invalid);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Allow 'Window' menu: */
     actionPool()->toRuntime()->setRestrictionForMenuBar(UIActionRestrictionLevel_Logic,
                                                         UIExtraDataMetaDefs::MenuType_Invalid);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Call to base-class: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h	(revision 60362)
@@ -81,12 +81,12 @@
     void prepareActionConnections();
     void prepareMachineWindows();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     void prepareMenu();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Cleanup helpers: */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     void cleanupMenu();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     void cleanupMachineWindows();
     void cleanupActionConnections();
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp	(revision 60362)
@@ -24,7 +24,7 @@
 # include <QMainWindow>
 # include <QTimer>
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <QMenuBar>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
@@ -44,7 +44,7 @@
 
 /* External includes: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 # include <limits.h>
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp	(revision 60362)
@@ -32,10 +32,10 @@
 # include "UIMachineWindowSeamless.h"
 # include "UIMachineView.h"
-# if   defined(Q_WS_WIN) || defined(Q_WS_X11)
+# if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 #  include "UIMachineDefs.h"
 #  include "UIMiniToolBar.h"
-# elif defined(Q_WS_MAC)
+# elif defined(VBOX_WS_MAC)
 #  include "VBoxUtils.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -47,11 +47,11 @@
 UIMachineWindowSeamless::UIMachineWindowSeamless(UIMachineLogic *pMachineLogic, ulong uScreenId)
     : UIMachineWindow(pMachineLogic, uScreenId)
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     , m_pMiniToolBar(0)
-#endif /* Q_WS_WIN || Q_WS_X11 */
-{
-}
-
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+{
+}
+
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 void UIMachineWindowSeamless::sltMachineStateChanged()
 {
@@ -70,10 +70,10 @@
 
     /* Revoke stolen activation: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     raise();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     activateWindow();
 }
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 void UIMachineWindowSeamless::prepareVisualState()
@@ -87,5 +87,5 @@
 
 #ifdef VBOX_WITH_TRANSLUCENT_SEAMLESS
-# if defined(Q_WS_MAC) && QT_VERSION < 0x050000
+# if defined(VBOX_WS_MAC) && QT_VERSION < 0x050000
     /* Using native API to enable translucent background for the Mac host.
      * - We also want to disable window-shadows which is possible
@@ -93,5 +93,5 @@
      *   while minimum supported version is 4.7.1 for now: */
     ::darwinSetShowsWindowTransparent(this, true);
-# else /* !Q_WS_MAC || QT_VERSION >= 0x050000 */
+# else /* !VBOX_WS_MAC || QT_VERSION >= 0x050000 */
     /* Using Qt API to enable translucent background:
      * - Under Win host Qt conflicts with 3D stuff (black seamless regions).
@@ -99,5 +99,5 @@
      *   until version 4.8, but minimum supported version is 4.7.1 for now. */
     setAttribute(Qt::WA_TranslucentBackground);
-# endif /* !Q_WS_MAC || QT_VERSION >= 0x050000 */
+# endif /* !VBOX_WS_MAC || QT_VERSION >= 0x050000 */
 #endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS */
 
@@ -108,11 +108,11 @@
 #endif /* VBOX_WITH_MASKED_SEAMLESS */
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /* Prepare mini-toolbar: */
     prepareMiniToolbar();
-#endif /* Q_WS_WIN || Q_WS_X11 */
-}
-
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+}
+
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 void UIMachineWindowSeamless::prepareMiniToolbar()
 {
@@ -140,7 +140,7 @@
     }
 }
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 void UIMachineWindowSeamless::cleanupMiniToolbar()
 {
@@ -155,12 +155,12 @@
     m_pMiniToolBar = 0;
 }
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 void UIMachineWindowSeamless::cleanupVisualState()
 {
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /* Cleanup mini-toolbar: */
     cleanupMiniToolbar();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
     /* Call to base-class: */
@@ -179,5 +179,5 @@
     move(workingArea.topLeft());
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /* If there is a mini-toolbar: */
     if (m_pMiniToolBar)
@@ -187,5 +187,5 @@
         m_pMiniToolBar->move(workingArea.topLeft());
     }
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 }
 
@@ -200,5 +200,5 @@
         !pSeamlessLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
         /* If there is a mini-toolbar: */
         if (m_pMiniToolBar)
@@ -207,5 +207,5 @@
             m_pMiniToolBar->hide();
         }
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
         /* Hide window: */
@@ -224,5 +224,5 @@
         show();
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
         /* If there is a mini-toolbar: */
         if (m_pMiniToolBar)
@@ -231,5 +231,5 @@
             m_pMiniToolBar->show();
         }
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
         /* Adjust machine-view size if necessary: */
@@ -241,5 +241,5 @@
 }
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 void UIMachineWindowSeamless::updateAppearanceOf(int iElement)
 {
@@ -265,7 +265,7 @@
     }
 }
-#endif /* Q_WS_WIN || Q_WS_X11 */
-
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+#ifdef VBOX_WS_WIN
 # if QT_VERSION >= 0x050000
 void UIMachineWindowSeamless::showEvent(QShowEvent *pEvent)
@@ -281,5 +281,5 @@
 }
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 #ifdef VBOX_WITH_MASKED_SEAMLESS
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h	(revision 60362)
@@ -22,8 +22,8 @@
 #include "UIMachineWindow.h"
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 /* Forward declarations: */
 class UIMiniToolBar;
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 /** UIMachineWindow reimplementation,
@@ -40,5 +40,5 @@
 private slots:
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Handles machine state change event. */
     void sltMachineStateChanged();
@@ -46,5 +46,5 @@
     /** Revokes window activation. */
     void sltRevokeWindowActivation();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 private:
@@ -52,13 +52,13 @@
     /** Prepare visual-state routine. */
     void prepareVisualState();
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Prepare mini-toolbar routine. */
     void prepareMiniToolbar();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Cleanup mini-toolbar routine. */
     void cleanupMiniToolbar();
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
     /** Cleanup visual-state routine. */
     void cleanupVisualState();
@@ -69,15 +69,15 @@
     void showInNecessaryMode();
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Common update routine. */
     void updateAppearanceOf(int iElement);
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
 # if QT_VERSION >= 0x050000
     /** Win: Handles show @a pEvent. */
     void showEvent(QShowEvent *pEvent);
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 #ifdef VBOX_WITH_MASKED_SEAMLESS
@@ -86,8 +86,8 @@
 #endif /* VBOX_WITH_MASKED_SEAMLESS */
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     /** Holds the mini-toolbar instance. */
     UIMiniToolBar *m_pMiniToolBar;
-#endif /* Q_WS_WIN || Q_WS_X11 */
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 #ifdef VBOX_WITH_MASKED_SEAMLESS
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp	(revision 60362)
@@ -46,9 +46,9 @@
     void retranslateUi()
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         setName(QApplication::translate("UIActionPool", "&File", "Mac OS X version"));
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         setName(QApplication::translate("UIActionPool", "&File", "Non Mac OS X version"));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
 };
@@ -831,8 +831,8 @@
     void retranslateUi()
     {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
         setName(QApplication::translate("UIActionPool", "S&how in Finder"));
         setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition files in Finder"));
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
         setName(QApplication::translate("UIActionPool", "S&how in Explorer"));
         setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition files in Explorer"));
@@ -862,5 +862,5 @@
     void retranslateUi()
     {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
         setName(QApplication::translate("UIActionPool", "Cr&eate Alias on Desktop"));
         setStatusTip(QApplication::translate("UIActionPool", "Create alias files to the VirtualBox Machine Definition files on your desktop"));
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 60362)
@@ -65,16 +65,16 @@
 # include "UIExtraDataManager.h"
 # include "VBoxGlobal.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils.h"
 #  include "UIWindowMenuManager.h"
 #  include "UIImageTools.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* Other VBox stuff: */
 # include <iprt/buildconfig.h>
 # include <VBox/version.h>
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
 #  include <iprt/env.h>
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -115,7 +115,7 @@
     , m_pActionPool(0)
     , m_pSplitter(0)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     , m_pBar(0)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     , m_pToolBar(0)
     , m_pContainerDetails(0)
@@ -140,9 +140,9 @@
     QAction *pShowToolBar = new QAction(tr("Show Toolbar"), 0);
     pShowToolBar->setCheckable(true);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     pShowToolBar->setChecked(m_pToolBar->isVisible());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     pShowToolBar->setChecked(m_pBar->isVisible());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     actions << pShowToolBar;
     QAction *pShowStatusBar = new QAction(tr("Show Statusbar"), 0);
@@ -160,17 +160,17 @@
         if (pResult->isChecked())
         {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             m_pToolBar->show();
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             m_pBar->show();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         }
         else
         {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             m_pToolBar->hide();
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             m_pBar->hide();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         }
     }
@@ -324,9 +324,9 @@
     for (int i = 0; i < list.size(); ++i)
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         QString strFile = ::darwinResolveAlias(list.at(i).toLocalFile());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         QString strFile = list.at(i).toLocalFile();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         if (!strFile.isEmpty() && QFile::exists(strFile))
         {
@@ -401,9 +401,9 @@
 {
     /* Show Import Appliance wizard: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     QString strTmpFile = ::darwinResolveAlias(strFileName);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     QString strTmpFile = strFileName;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     UISafePointerWizardImportApp pWizard = new UIWizardImportApp(this, strTmpFile);
     pWizard->prepare();
@@ -467,9 +467,9 @@
 {
     /* Initialize variables: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     QString strTmpFile = ::darwinResolveAlias(strFileName);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     QString strTmpFile = strFileName;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     CVirtualBox vbox = vboxGlobal().virtualBox();
     if (strTmpFile.isEmpty())
@@ -1025,8 +1025,8 @@
     sltHandleChooserPaneIndexChange();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Avoid bug in Qt Cocoa which results in showing a "more arrow" on size-hint changes: */
     m_pToolBar->updateLayout();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -1050,10 +1050,10 @@
             if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
             {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                 QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
                 m_geometry.moveTo(pMoveEvent->pos());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
                 m_geometry.moveTo(geometry().x(), geometry().y());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             }
             break;
@@ -1065,5 +1065,5 @@
             break;
         }
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         case QEvent::ContextMenu:
         {
@@ -1076,5 +1076,5 @@
             break;
         }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         default:
             break;
@@ -1106,5 +1106,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 bool UISelectorWindow::eventFilter(QObject *pObject, QEvent *pEvent)
 {
@@ -1134,12 +1134,12 @@
     return QIWithRetranslateUI<QMainWindow>::eventFilter(pObject, pEvent);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UISelectorWindow::prepare()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* We have to make sure that we are getting the front most process: */
     ::darwinSetFrontMostProcess();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Cache medium data early if necessary: */
@@ -1160,5 +1160,5 @@
     retranslateUi();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Enable unified toolbar: */
     m_pToolBar->enableMacToolbar();
@@ -1173,5 +1173,5 @@
     /* General event filter: */
     qApp->installEventFilter(this);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -1182,10 +1182,10 @@
      * On Mac OS X the icon referenced in info.plist is used.
      * On X11 we will provide as much icons as we can. */
-#if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
+#if !(defined (VBOX_WS_WIN) || defined (VBOX_WS_MAC))
     QIcon icon(":/VirtualBox.svg");
     icon.addFile(":/VirtualBox_48px.png");
     icon.addFile(":/VirtualBox_64px.png");
     setWindowIcon(icon);
-#endif /* !Q_WS_WIN && !Q_WS_MAC */
+#endif /* !VBOX_WS_WIN && !VBOX_WS_MAC */
 }
 
@@ -1219,10 +1219,10 @@
     m_pMachineMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndexST_M_Machine)->menu());
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Prepare 'Window' menu: */
     UIWindowMenuManager::create();
     menuBar()->addMenu(gpWindowMenuManager->createMenu(this));
     gpWindowMenuManager->addWindow(this);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Prepare Help-menu: */
@@ -1241,5 +1241,5 @@
     /* The Application / 'File' menu contents is very different depending on host type. */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* 'About' action goes to Application menu: */
     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
@@ -1268,5 +1268,5 @@
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
 
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
 
     /* 'Preferences' action goes to 'File' menu: */
@@ -1298,5 +1298,5 @@
     /* 'Close' action goes to 'File' menu: */
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -1475,7 +1475,7 @@
     /* Prepare splitter: */
     m_pSplitter = new QISplitter(this);
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     m_pSplitter->setHandleType(QISplitter::Native);
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Prepare tool-bar: */
@@ -1511,10 +1511,10 @@
 
     /* Layout all the widgets: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     addToolBar(m_pToolBar);
     /* Central widget @ horizontal layout: */
     setCentralWidget(m_pSplitter);
     m_pSplitter->addWidget(m_pPaneChooser);
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     QWidget *pCentralWidget = new QWidget(this);
     setCentralWidget(pCentralWidget);
@@ -1527,5 +1527,5 @@
     pCentralLayout->addWidget(m_pSplitter);
     m_pSplitter->addWidget(m_pPaneChooser);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     m_pSplitter->addWidget(m_pContainerDetails);
 
@@ -1612,10 +1612,10 @@
 
     /* Tool-bar connections: */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     connect(m_pToolBar, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(sltShowSelectorWindowContextMenu(const QPoint&)));
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* We want to receive right click notifications on the title bar, so register our own handler: */
     ::darwinRegisterForUnifiedToolbarContextMenuEvents(this);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* VM desktop connections: */
@@ -1639,10 +1639,10 @@
         /* Load geometry: */
         m_geometry = gEDataManager->selectorWindowGeometry(this);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         move(m_geometry.topLeft());
         resize(m_geometry.size());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         setGeometry(m_geometry);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UISelectorWindow: Geometry loaded to: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
@@ -1670,9 +1670,9 @@
     /* Restore toolbar and statusbar visibility: */
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         m_pToolBar->setHidden(!gEDataManager->selectorWindowToolBarVisible());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         m_pBar->setHidden(!gEDataManager->selectorWindowToolBarVisible());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         statusBar()->setHidden(!gEDataManager->selectorWindowStatusBarVisible());
     }
@@ -1683,9 +1683,9 @@
     /* Save toolbar and statusbar visibility: */
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         gEDataManager->setSelectorWindowToolBarVisible(!m_pToolBar->isHidden());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         gEDataManager->setSelectorWindowToolBarVisible(!m_pBar->isHidden());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         gEDataManager->setSelectorWindowStatusBarVisible(!statusBar()->isHidden());
     }
@@ -1698,9 +1698,9 @@
     /* Save window geometry: */
     {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         gEDataManager->setSelectorWindowGeometry(m_geometry, ::darwinIsWindowMaximized(this));
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         gEDataManager->setSelectorWindowGeometry(m_geometry, isMaximized());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         LogRel2(("GUI: UISelectorWindow: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
                  m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
@@ -1710,16 +1710,16 @@
 void UISelectorWindow::cleanupConnections()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Tool-bar connections: */
     ::darwinUnregisterForUnifiedToolbarContextMenuEvents(this);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
 void UISelectorWindow::cleanupMenuBar()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Cleanup 'Window' menu: */
     UIWindowMenuManager::destroy();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Destroy action-pool: */
@@ -1833,8 +1833,8 @@
     actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->blockSignals(false);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Avoid bug in Qt Cocoa which results in showing a "more arrow" on size-hint changes: */
     m_pToolBar->updateLayout();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -2013,8 +2013,8 @@
     foreach (UIVMItem *pItem, items)
         if (pItem->accessible()
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             /* On Mac OS X this are real alias files, which don't work with the old legacy xml files. */
             && pItem->settingsFile().endsWith(".vbox", Qt::CaseInsensitive)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
             )
             return true;
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 60362)
@@ -179,8 +179,8 @@
         /** Handles first Qt show @a pEvent. */
         virtual void polishEvent(QShowEvent *pEvent);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /** Mac OS X: Preprocesses any Qt @a pEvent for passed @a pObject. */
         virtual bool eventFilter(QObject *pObject, QEvent *pEvent);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /** @} */
 
@@ -271,8 +271,8 @@
     QISplitter *m_pSplitter;
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /** Holds the main bar instance. */
     UIMainBar *m_pBar;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     /** Holds the main toolbar instance. */
     UIToolBar *m_pToolBar;
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp	(revision 60362)
@@ -24,7 +24,7 @@
 # include <QStackedWidget>
 # include <QToolButton>
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <QTimer>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* GUI includes */
@@ -47,19 +47,19 @@
 
 
-//#ifdef Q_WS_MAC
+//#ifdef VBOX_WS_MAC
 # define USE_TOOLBAR
-//#endif /* Q_WS_MAC */
-
-#ifdef Q_WS_MAC
+//#endif /* VBOX_WS_MAC */
+
+#ifdef VBOX_WS_MAC
 static const int gsLeftMargin = 5;
 static const int gsTopMargin = 5;
 static const int gsRightMargin = 5;
 static const int gsBottomMargin = 5;
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
 static const int gsLeftMargin = 0;
 static const int gsTopMargin = 5;
 static const int gsRightMargin = 5;
 static const int gsBottomMargin = 5;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 /* Container to store VM desktop panes. */
@@ -255,12 +255,12 @@
     }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Cocoa stuff should be async...
      * Do not ask me why but otherwise
      * it conflicts with native handlers. */
     QTimer::singleShot(0, this, SLOT(sltInit()));
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     sltInit();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Prepare main layout: */
@@ -282,7 +282,7 @@
             pSpace->setFixedSize(10, 1);
         pToolBar->addWidget(pSpace);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         pToolBar->updateLayout();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     }
     else
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp	(revision 60362)
@@ -29,7 +29,7 @@
 # include "UIConverter.h"
 # include "UIExtraDataManager.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include <ApplicationServices/ApplicationServices.h>
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -45,5 +45,5 @@
 #if 0
 
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
 
 struct EnumWindowsProcData
@@ -112,5 +112,5 @@
 static WId FindWindowIdFromPid(ULONG aPid)
 {
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
 
     EnumWindowsProcData d = { aPid, (WId) ~0 };
@@ -119,10 +119,10 @@
     return d.wid;
 
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
 
     NOREF(aPid);
     return (WId) ~0;
 
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
 
     /** @todo Figure out how to get access to another windows of another process...
@@ -321,5 +321,5 @@
 bool UIVMItem::switchTo()
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     ULONG64 id = m_machine.ShowConsoleWindow();
 #else
@@ -335,9 +335,9 @@
         return true;
 
-#if defined (Q_WS_WIN) || defined (Q_WS_X11)
+#if defined (VBOX_WS_WIN) || defined (VBOX_WS_X11)
 
     return vboxGlobal().activateWindow(id, true);
 
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
     /*
      * This is just for the case were the other process cannot steal
@@ -366,5 +366,5 @@
         return false;
 
-#if defined (Q_WS_WIN)
+#if defined (VBOX_WS_WIN)
 
     HWND hwnd = mWinId;
@@ -402,9 +402,9 @@
     return true;
 
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
 
     return false;
 
-#elif defined (Q_WS_MAC)
+#elif defined (VBOX_WS_MAC)
 
     ProcessSerialNumber psn;
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserHandlerKeyboard.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserHandlerKeyboard.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserHandlerKeyboard.cpp	(revision 60362)
@@ -74,10 +74,10 @@
 
             /* Was control modifier pressed? */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             if (pEvent->modifiers() & Qt::ControlModifier &&
                 pEvent->modifiers() & Qt::KeypadModifier)
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             if (pEvent->modifiers() == Qt::ControlModifier)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             {
                 /* Shift item up: */
@@ -87,10 +87,10 @@
 
             /* Was shift modifier pressed? */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             else if (pEvent->modifiers() & Qt::ShiftModifier &&
                      pEvent->modifiers() & Qt::KeypadModifier)
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             else if (pEvent->modifiers() == Qt::ShiftModifier)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             {
                 /* Determine focus item position: */
@@ -131,9 +131,9 @@
 
             /* There is no modifiers pressed? */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             else if (pEvent->modifiers() == Qt::KeypadModifier)
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             else if (pEvent->modifiers() == Qt::NoModifier)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             {
                 /* Determine focus item position: */
@@ -171,10 +171,10 @@
 
             /* Was control modifier pressed? */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             if (pEvent->modifiers() & Qt::ControlModifier &&
                 pEvent->modifiers() & Qt::KeypadModifier)
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             if (pEvent->modifiers() == Qt::ControlModifier)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             {
                 /* Shift item down: */
@@ -184,10 +184,10 @@
 
             /* Was shift modifier pressed? */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             else if (pEvent->modifiers() & Qt::ShiftModifier &&
                      pEvent->modifiers() & Qt::KeypadModifier)
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             else if (pEvent->modifiers() == Qt::ShiftModifier)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             {
                 /* Determine focus item position: */
@@ -228,9 +228,9 @@
 
             /* There is no modifiers pressed? */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             else if (pEvent->modifiers() == Qt::KeypadModifier)
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
             else if (pEvent->modifiers() == Qt::NoModifier)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             {
                 /* Determine focus item position: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp	(revision 60362)
@@ -1105,13 +1105,13 @@
 
     /* Colors: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_iHighlightLightness = 115;
     m_iHoverLightness = 110;
     m_iHoverHighlightLightness = 120;
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     m_iHighlightLightness = 130;
     m_iHoverLightness = 155;
     m_iHoverHighlightLightness = 175;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Fonts: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp	(revision 60362)
@@ -404,5 +404,5 @@
         }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         /* Get 'Unscaled HiDPI Video Output' mode value: */
         const QString strUnscaledHiDPIMode = machine.GetExtraData(UIExtraDataDefs::GUI_HiDPI_UnscaledOutput);
@@ -418,5 +418,5 @@
                                          QApplication::translate("UIGDetails", "Enabled", "details (display/Unscaled HiDPI Video Output)"));
         }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
         QStringList acceleration;
@@ -855,5 +855,5 @@
     if (machine.GetAccessible())
     {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Get menu-bar availability status: */
         const QString strMenubarEnabled = machine.GetExtraData(UIExtraDataDefs::GUI_MenuBar_Enabled);
@@ -869,5 +869,5 @@
                                                 QApplication::translate("UIGDetails", "Disabled", "details (user interface/menu-bar)"));
         }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
         /* Get status-bar availability status: */
@@ -885,5 +885,5 @@
         }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Get mini-toolbar availability status: */
         const QString strMiniToolbarEnabled = machine.GetExtraData(UIExtraDataDefs::GUI_ShowMiniToolBar);
@@ -921,5 +921,5 @@
                                          QApplication::translate("UIGDetails", "Disabled", "details (user interface/mini-toolbar)"));
         }
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     }
     else
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp	(revision 60362)
@@ -41,13 +41,13 @@
 # include "UIIconPool.h"
 # include "UIConverter.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # define VBOX_GUI_WITH_TOOLBAR_SETTINGS
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* Settings Dialog Constructor: */
@@ -184,5 +184,5 @@
 {
     int index = m_pages[cId];
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # if QT_VERSION < 0x050000
     QSize cs = size();
@@ -619,5 +619,5 @@
 
     int iMinWidth = m_pSelector->minWidth();
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* Remove all title bar buttons (Buggy Qt): */
     ::darwinSetHidesAllTitleButtons(this);
@@ -689,5 +689,5 @@
 
     sltCategoryChanged(m_pSelector->currentId());
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Resize to the minimum possible size: */
     QSize s = minimumSize();
@@ -695,5 +695,5 @@
         s.setWidth(iMinWidth);
     resize(s);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h	(revision 60362)
@@ -165,7 +165,7 @@
 
     QMap<int, int> m_pages;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     QList<QSize> m_sizeList;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	(revision 60362)
@@ -61,7 +61,7 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 # define VBOX_GUI_WITH_TOOLBAR_SETTINGS
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 UISettingsDialogGlobal::UISettingsDialogGlobal(QWidget *pParent,
@@ -71,7 +71,7 @@
 {
     /* Window icon: */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     setWindowIcon(QIcon(":/global_settings_16px.png"));
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Creating settings pages: */
@@ -323,7 +323,7 @@
 {
     /* Window icon: */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     setWindowIcon(QIcon(":/vm_settings_16px.png"));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Allow to reset first-run flag just when medium enumeration was finished: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp	(revision 60362)
@@ -393,7 +393,7 @@
     mTbSelector->setUseTextLabels (true);
     mTbSelector->setIconSize (QSize (32, 32));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     mTbSelector->setShowToolBarButton (false);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /* Init the action group for house keeping */
     mActionGroup = new QActionGroup (this);
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp	(revision 60362)
@@ -202,8 +202,8 @@
      */
     QString displayInfo;
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     if (pParent)
         displayInfo.sprintf("hwnd=%#llx", (uint64_t)(uintptr_t)pParent->winId());
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
     /* Prepare installation progress: */
     CProgress progress = extPackFile.Install(fReplaceIt, displayInfo);
@@ -420,7 +420,7 @@
             /** @todo Refuse this if any VMs are running. */
             QString displayInfo;
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
             displayInfo.sprintf("hwnd=%#llx", (uint64_t)(uintptr_t)this->winId());
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
             /* Prepare uninstallation progress: */
             CProgress progress = manager.Uninstall(strSelectedPackageName, false /* forced removal? */, displayInfo);
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp	(revision 60362)
@@ -67,9 +67,9 @@
             m_pSelectorModel, SLOT(sltHandleFilterTextChange(const QString &)));
     QVBoxLayout *pSelectorLayout = new QVBoxLayout(pSelectorTab);
-#ifndef Q_WS_WIN
+#ifndef VBOX_WS_WIN
     /* On Windows host that looks ugly, but
      * On Mac OS X and X11 that deserves it's place. */
     pSelectorLayout->setContentsMargins(0, 0, 0, 0);
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
     pSelectorLayout->setSpacing(1);
     pSelectorLayout->addWidget(m_pSelectorFilterEditor);
@@ -87,9 +87,9 @@
             m_pMachineModel, SLOT(sltHandleFilterTextChange(const QString &)));
     QVBoxLayout *pMachineLayout = new QVBoxLayout(pMachineTab);
-#ifndef Q_WS_WIN
+#ifndef VBOX_WS_WIN
     /* On Windows host that looks ugly, but
      * On Mac OS X and X11 that deserves it's place. */
     pMachineLayout->setContentsMargins(0, 0, 0, 0);
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
     pMachineLayout->setSpacing(1);
     pMachineLayout->addWidget(m_pMachineFilterEditor);
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 60362)
@@ -489,10 +489,10 @@
     }
 
-#ifndef Q_WS_WIN
+#ifndef VBOX_WS_WIN
     /* On Windows host that looks ugly, but
      * On Mac OS X and X11 that deserves it's place. */
     m_pLayoutNAT->setContentsMargins(0, 0, 0, 0);
     m_pLayoutHostOnly->setContentsMargins(0, 0, 0, 0);
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
 
     /* Apply language settings: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp	(revision 60362)
@@ -43,5 +43,5 @@
     m_pIPv6Editor->setFixedWidthByText(QString().fill('X', 32) + QString().fill(':', 7));
 
-#if 0 /* defined (Q_WS_WIN) */
+#if 0 /* defined (VBOX_WS_WIN) */
     QStyleOption options1;
     options1.initFrom(m_pEnableManualCheckbox);
@@ -98,5 +98,5 @@
     /* Host Interface: */
     m_pEnableManualCheckbox->setChecked(!m_data.m_interface.m_fDhcpClientEnabled);
-#if !0 /* !defined (Q_WS_WIN) */
+#if !0 /* !defined (VBOX_WS_WIN) */
     /* Disable automatic for all hosts for now: */
     m_pEnableManualCheckbox->setChecked(true);
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	(revision 60362)
@@ -101,7 +101,7 @@
     displayData.m_cGuestScreenCount = m_machine.GetMonitorCount();
     displayData.m_dScaleFactor = gEDataManager->scaleFactor(m_machine.GetId());
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     displayData.m_fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(m_machine.GetId());
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     displayData.m_f3dAccelerationEnabled = m_machine.GetAccelerate3DEnabled();
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -152,7 +152,7 @@
     m_pEditorVideoScreenCount->setValue(displayData.m_cGuestScreenCount);
     m_pEditorGuestScreenScale->setValue((int)(displayData.m_dScaleFactor * 100));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_pCheckBoxUnscaledHiDPIOutput->setChecked(displayData.m_fUseUnscaledHiDPIOutput);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     m_pCheckbox3D->setChecked(displayData.m_f3dAccelerationEnabled);
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -201,7 +201,7 @@
     displayData.m_cGuestScreenCount = m_pEditorVideoScreenCount->value();
     displayData.m_dScaleFactor = (double)m_pEditorGuestScreenScale->value() / 100;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     displayData.m_fUseUnscaledHiDPIOutput = m_pCheckBoxUnscaledHiDPIOutput->isChecked();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     displayData.m_f3dAccelerationEnabled = m_pCheckbox3D->isChecked();
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -259,7 +259,7 @@
         {
             gEDataManager->setScaleFactor(displayData.m_dScaleFactor, m_machine.GetId());
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             gEDataManager->setUseUnscaledHiDPIOutput(displayData.m_fUseUnscaledHiDPIOutput, m_machine.GetId());
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         }
 
@@ -537,11 +537,11 @@
     m_pLabelGuestScreenScaleMax->setEnabled(isMachineInValidMode());
     m_pEditorGuestScreenScale->setEnabled(isMachineInValidMode());
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_pLabelHiDPI->setEnabled(isMachineInValidMode());
     m_pCheckBoxUnscaledHiDPIOutput->setEnabled(isMachineInValidMode());
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     m_pLabelHiDPI->hide();
     m_pCheckBoxUnscaledHiDPIOutput->hide();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     m_pLabelVideoOptions->setEnabled(isMachineOffline());
     m_pCheckbox3D->setEnabled(isMachineOffline());
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h	(revision 60362)
@@ -37,7 +37,7 @@
         , m_cGuestScreenCount(0)
         , m_dScaleFactor(1.0)
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         , m_fUseUnscaledHiDPIOutput(false)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         , m_f3dAccelerationEnabled(false)
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -65,7 +65,7 @@
                (m_cGuestScreenCount == other.m_cGuestScreenCount) &&
                (m_dScaleFactor == other.m_dScaleFactor) &&
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput) &&
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
                (m_f3dAccelerationEnabled == other.m_f3dAccelerationEnabled) &&
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -95,7 +95,7 @@
     int m_cGuestScreenCount;
     double m_dScaleFactor;
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     bool m_fUseUnscaledHiDPIOutput;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     bool m_f3dAccelerationEnabled;
 #ifdef VBOX_WITH_VIDEOHWACCEL
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 60362)
@@ -553,7 +553,7 @@
     {
         /* Configure Description text editor: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         mTeDescription->setMinimumHeight(150);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     }
 }
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp	(revision 60362)
@@ -58,7 +58,7 @@
     interfaceData.m_statusBarRestrictions = gEDataManager->restrictedStatusBarIndicators(m_machine.GetId());
     interfaceData.m_statusBarOrder = gEDataManager->statusBarIndicatorOrder(m_machine.GetId());
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     interfaceData.m_fMenuBarEnabled = gEDataManager->menuBarEnabled(m_machine.GetId());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     interfaceData.m_restrictionsOfMenuBar = gEDataManager->restrictedRuntimeMenuTypes(m_machine.GetId());
     interfaceData.m_restrictionsOfMenuApplication = gEDataManager->restrictedRuntimeMenuApplicationActionTypes(m_machine.GetId());
@@ -70,12 +70,12 @@
     interfaceData.m_restrictionsOfMenuDebug = gEDataManager->restrictedRuntimeMenuDebuggerActionTypes(m_machine.GetId());
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     interfaceData.m_restrictionsOfMenuWindow = gEDataManager->restrictedRuntimeMenuWindowActionTypes(m_machine.GetId());
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     interfaceData.m_restrictionsOfMenuHelp = gEDataManager->restrictedRuntimeMenuHelpActionTypes(m_machine.GetId());
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     interfaceData.m_fShowMiniToolBar = gEDataManager->miniToolbarEnabled(m_machine.GetId());
     interfaceData.m_fMiniToolBarAtTop = gEDataManager->miniToolbarAlignment(m_machine.GetId()) == Qt::AlignTop;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Cache interface data: */
@@ -97,7 +97,7 @@
     m_pStatusBarEditor->setStatusBarConfiguration(interfaceData.m_statusBarRestrictions,
                                                   interfaceData.m_statusBarOrder);
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     m_pMenuBarEditor->setMenuBarEnabled(interfaceData.m_fMenuBarEnabled);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     m_pMenuBarEditor->setRestrictionsOfMenuBar(interfaceData.m_restrictionsOfMenuBar);
     m_pMenuBarEditor->setRestrictionsOfMenuApplication(interfaceData.m_restrictionsOfMenuApplication);
@@ -109,12 +109,12 @@
     m_pMenuBarEditor->setRestrictionsOfMenuDebug(interfaceData.m_restrictionsOfMenuDebug);
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_pMenuBarEditor->setRestrictionsOfMenuWindow(interfaceData.m_restrictionsOfMenuWindow);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     m_pMenuBarEditor->setRestrictionsOfMenuHelp(interfaceData.m_restrictionsOfMenuHelp);
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     m_pCheckBoxShowMiniToolBar->setChecked(interfaceData.m_fShowMiniToolBar);
     m_pComboToolBarAlignment->setChecked(interfaceData.m_fMiniToolBarAtTop);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Polish page finally: */
@@ -136,7 +136,7 @@
     interfaceData.m_statusBarRestrictions = m_pStatusBarEditor->statusBarIndicatorRestrictions();
     interfaceData.m_statusBarOrder = m_pStatusBarEditor->statusBarIndicatorOrder();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     interfaceData.m_fMenuBarEnabled = m_pMenuBarEditor->isMenuBarEnabled();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     interfaceData.m_restrictionsOfMenuBar = m_pMenuBarEditor->restrictionsOfMenuBar();
     interfaceData.m_restrictionsOfMenuApplication = m_pMenuBarEditor->restrictionsOfMenuApplication();
@@ -148,12 +148,12 @@
     interfaceData.m_restrictionsOfMenuDebug = m_pMenuBarEditor->restrictionsOfMenuDebug();
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     interfaceData.m_restrictionsOfMenuWindow = m_pMenuBarEditor->restrictionsOfMenuWindow();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     interfaceData.m_restrictionsOfMenuHelp = m_pMenuBarEditor->restrictionsOfMenuHelp();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     interfaceData.m_fShowMiniToolBar = m_pCheckBoxShowMiniToolBar->isChecked();
     interfaceData.m_fMiniToolBarAtTop = m_pComboToolBarAlignment->isChecked();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Cache interface data: */
@@ -180,7 +180,7 @@
             gEDataManager->setRestrictedStatusBarIndicators(interfaceData.m_statusBarRestrictions, m_machine.GetId());
             gEDataManager->setStatusBarIndicatorOrder(interfaceData.m_statusBarOrder, m_machine.GetId());
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
             gEDataManager->setMenuBarEnabled(interfaceData.m_fMenuBarEnabled, m_machine.GetId());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
             gEDataManager->setRestrictedRuntimeMenuTypes(interfaceData.m_restrictionsOfMenuBar, m_machine.GetId());
             gEDataManager->setRestrictedRuntimeMenuApplicationActionTypes(interfaceData.m_restrictionsOfMenuApplication, m_machine.GetId());
@@ -192,12 +192,12 @@
             gEDataManager->setRestrictedRuntimeMenuDebuggerActionTypes(interfaceData.m_restrictionsOfMenuDebug, m_machine.GetId());
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             gEDataManager->setRestrictedRuntimeMenuWindowActionTypes(interfaceData.m_restrictionsOfMenuWindow, m_machine.GetId());
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
             gEDataManager->setRestrictedRuntimeMenuHelpActionTypes(interfaceData.m_restrictionsOfMenuHelp, m_machine.GetId());
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
             gEDataManager->setMiniToolbarEnabled(interfaceData.m_fShowMiniToolBar, m_machine.GetId());
             gEDataManager->setMiniToolbarAlignment(interfaceData.m_fMiniToolBarAtTop ? Qt::AlignTop : Qt::AlignBottom, m_machine.GetId());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         }
     }
@@ -224,13 +224,13 @@
     /* Polish interface availability: */
     m_pMenuBarEditor->setEnabled(isMachineInValidMode());
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_pLabelMiniToolBar->hide();
     m_pCheckBoxShowMiniToolBar->hide();
     m_pComboToolBarAlignment->hide();
-#else /* !Q_WS_MAC */
+#else /* !VBOX_WS_MAC */
     m_pLabelMiniToolBar->setEnabled(isMachineInValidMode());
     m_pCheckBoxShowMiniToolBar->setEnabled(isMachineInValidMode());
     m_pComboToolBarAlignment->setEnabled(isMachineInValidMode() && m_pCheckBoxShowMiniToolBar->isChecked());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     m_pStatusBarEditor->setEnabled(isMachineInValidMode());
 }
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h	(revision 60362)
@@ -32,7 +32,7 @@
     UIDataSettingsMachineInterface()
         : m_fStatusBarEnabled(false)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         , m_fMenuBarEnabled(false)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         , m_restrictionsOfMenuBar(UIExtraDataMetaDefs::MenuType_Invalid)
         , m_restrictionsOfMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Invalid)
@@ -44,12 +44,12 @@
         , m_restrictionsOfMenuDebug(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType_Invalid)
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         , m_restrictionsOfMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType_Invalid)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         , m_restrictionsOfMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Invalid)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         , m_fShowMiniToolBar(false)
         , m_fMiniToolBarAtTop(false)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     {}
 
@@ -60,7 +60,7 @@
                && (m_statusBarRestrictions == other.m_statusBarRestrictions)
                && (m_statusBarOrder == other.m_statusBarOrder)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
                && (m_fMenuBarEnabled == other.m_fMenuBarEnabled)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
                && (m_restrictionsOfMenuBar == other.m_restrictionsOfMenuBar)
                && (m_restrictionsOfMenuApplication == other.m_restrictionsOfMenuApplication)
@@ -72,12 +72,12 @@
                && (m_restrictionsOfMenuDebug == other.m_restrictionsOfMenuDebug)
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                && (m_restrictionsOfMenuWindow == other.m_restrictionsOfMenuWindow)
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
                && (m_restrictionsOfMenuHelp == other.m_restrictionsOfMenuHelp)
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
                && (m_fShowMiniToolBar == other.m_fShowMiniToolBar)
                && (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop)
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
                ;
     }
@@ -91,7 +91,7 @@
     QList<IndicatorType> m_statusBarRestrictions;
     QList<IndicatorType> m_statusBarOrder;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     bool m_fMenuBarEnabled;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     UIExtraDataMetaDefs::MenuType m_restrictionsOfMenuBar;
     UIExtraDataMetaDefs::MenuApplicationActionType m_restrictionsOfMenuApplication;
@@ -103,12 +103,12 @@
     UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType m_restrictionsOfMenuDebug;
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     UIExtraDataMetaDefs::MenuWindowActionType m_restrictionsOfMenuWindow;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     UIExtraDataMetaDefs::MenuHelpActionType m_restrictionsOfMenuHelp;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     bool m_fShowMiniToolBar;
     bool m_fMiniToolBarAtTop;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 };
 typedef UISettingsCache<UIDataSettingsMachineInterface> UICacheSettingsMachineInterface;
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp	(revision 60362)
@@ -64,8 +64,8 @@
     adjustSize();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     setFixedSize(minimumSize());
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
@@ -156,5 +156,5 @@
 
     QString strFolderName(mPsPath->path());
-#if defined (Q_WS_WIN) || defined (Q_OS_OS2)
+#if defined (VBOX_WS_WIN) || defined (Q_OS_OS2)
     if (strFolderName[0].isLetter() && strFolderName[1] == ':' && strFolderName[2] == 0)
     {
@@ -164,5 +164,5 @@
         mPsPath->setPath(strFolderName);
     }
-#endif /* Q_WS_WIN || Q_OS_OS2 */
+#endif /* VBOX_WS_WIN || Q_OS_OS2 */
     QDir folder(strFolderName);
     if (!folder.isRoot())
@@ -174,7 +174,7 @@
     {
         /* Processing root folder: */
-#if defined (Q_WS_WIN) || defined (Q_OS_OS2)
+#if defined (VBOX_WS_WIN) || defined (Q_OS_OS2)
         mLeName->setText(strFolderName.toUpper()[0] + "_DRIVE");
-#elif defined (Q_WS_X11)
+#elif defined (VBOX_WS_X11)
         mLeName->setText("ROOT");
 #endif
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 60362)
@@ -2075,9 +2075,9 @@
     mTbStorageBar->addAction (mDelCtrAction);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* We need a little more space for the focus rect. */
     mLtStorage->setContentsMargins (3, 0, 3, 0);
     mLtStorage->setSpacing (3);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Setup choose-medium button: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h	(revision 60362)
@@ -20,11 +20,11 @@
 
 /* Qt includes: */
-#include <QtGlobal> /* for Q_WS_MAC */
-#ifdef Q_WS_MAC
+#include <QtGlobal> /* for VBOX_WS_MAC */
+#ifdef VBOX_WS_MAC
 /* Somewhere Carbon.h includes AssertMacros.h which defines the macro "check".
  * In QItemDelegate a class method is called "check" also. As we not used the
  * macro undefine it here. */
 # undef check
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 #include <QItemDelegate>
 #include <QPointer>
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp	(revision 60362)
@@ -617,9 +617,9 @@
     mTbBootItemUp->setIcon(UIIconPool::iconSet(":/list_moveup_16px.png", ":/list_moveup_disabled_16px.png"));
     mTbBootItemDown->setIcon(UIIconPool::iconSet(":/list_movedown_16px.png", ":/list_movedown_disabled_16px.png"));
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /* We need a little space for the focus rect: */
     m_pLayoutBootOrder->setContentsMargins(3, 3, 3, 3);
     m_pLayoutBootOrder->setSpacing(3);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /* Install global event filter
      * to handle boot-table focus in/out events: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp	(revision 60362)
@@ -397,5 +397,5 @@
                  * the button hasn't a rectangle shape. This prevents the
                  * display of parts from the current text on the Mac. */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
                 /* Use the palette from the tree view, not the one from the
                  * editor. */
@@ -403,5 +403,5 @@
                 p.setBrush(QPalette::Highlight, pParent->palette().brush(QPalette::Highlight));
                 e->setPalette(p);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
                 e->setAutoFillBackground(true);
                 e->setBackgroundRole(QPalette::Highlight);
@@ -999,5 +999,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 bool VirtualSystemDelegate::eventFilter(QObject *pObject, QEvent *pEvent)
 {
@@ -1018,5 +1018,5 @@
     return QItemDelegate::eventFilter(pObject, pEvent);
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 ////////////////////////////////////////////////////////////////////////////////
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h	(revision 60362)
@@ -210,9 +210,9 @@
     {
         QSize size = QItemDelegate::sizeHint(styleOption, idx);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
         int h = 28;
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
         int h = 24;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
         size.setHeight(RT_MAX(h, size.height()));
         return size;
@@ -221,7 +221,7 @@
 protected:
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     bool eventFilter(QObject *pObject, QEvent *pEvent);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 private:
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp	(revision 60362)
@@ -68,12 +68,12 @@
     painter.setClipRect(pEvent->rect());
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     paintContentDarwin(&painter);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     paintContent(&painter);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 
 void UIBar::paintContentDarwin(QPainter *pPainter)
@@ -92,5 +92,5 @@
 }
 
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
 
 void UIBar::paintContent(QPainter *pPainter)
@@ -113,5 +113,5 @@
 }
 
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 UIMainBar::UIMainBar(QWidget *pParent /* = 0 */)
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.h	(revision 60362)
@@ -38,9 +38,9 @@
     void paintEvent(QPaintEvent *pEvent);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     void paintContentDarwin(QPainter *pPainter);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     void paintContent(QPainter *pPainter);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
 private:
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp	(revision 60362)
@@ -167,9 +167,9 @@
 
     /* Configure layout: */
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_pMainLayout->setContentsMargins(10, 10, 15, 10);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     m_pMainLayout->setContentsMargins(10, 10, 10, 10);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Add strech: */
@@ -185,9 +185,9 @@
     /* Configure font: */
     QFont currentFont = m_pCheckBox->font();
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     currentFont.setPointSize(currentFont.pointSize() - 2);
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     currentFont.setPointSize(currentFont.pointSize() - 1);
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
     m_pCheckBox->setFont(currentFont);
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 60362)
@@ -26,7 +26,7 @@
 # include <QStylePainter>
 # include <QTimer>
-# ifdef Q_WS_X11
+# ifdef VBOX_WS_X11
 #  include <QX11Info>
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 
 /* GUI includes: */
@@ -36,31 +36,31 @@
 # include "VBoxGlobal.h"
 # include "QIToolButton.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "UICocoaApplication.h"
 #  include "VBoxUtils-darwin.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 /* Qt includes: */
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
 # if QT_VERSION >= 0x050000
 #  include <QAbstractNativeEventFilter>
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC || Q_WS_WIN */
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
 
 /* GUI includes: */
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 # include "DarwinKeyboard.h"
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 # include "WinKeyboard.h"
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 # include "XKeyboard.h"
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* External includes: */
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 # include <Carbon/Carbon.h>
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
@@ -76,5 +76,5 @@
 #  endif /* KeyPress */
 # endif /* QT_VERSION < 0x050000 */
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 /* Namespaces: */
@@ -82,5 +82,5 @@
 
 
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
 # if QT_VERSION >= 0x050000
 /** QAbstractNativeEventFilter extension
@@ -115,5 +115,5 @@
 };
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC || Q_WS_WIN */
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
 
 
@@ -122,10 +122,10 @@
 *********************************************************************************************************************************/
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
 namespace UINativeHotKey
 {
     QMap<QString, QString> m_keyNames;
 }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 QString UINativeHotKey::toString(int iKeyCode)
@@ -133,5 +133,5 @@
     QString strKeyName;
 
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
     UInt32 modMask = DarwinKeyCodeToDarwinModifierMask(iKeyCode);
@@ -173,5 +173,5 @@
     }
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
     /* MapVirtualKey doesn't distinguish between right and left vkeys,
@@ -206,5 +206,5 @@
     delete[] pKeyName;
 
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 
     if (char *pNativeKeyName = ::XKeysymToString((KeySym)iKeyCode))
@@ -230,5 +230,5 @@
 bool UINativeHotKey::isValidKey(int iKeyCode)
 {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 
     UInt32 modMask = ::DarwinKeyCodeToDarwinModifierMask(iKeyCode);
@@ -248,5 +248,5 @@
     }
 
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
 
     return ((iKeyCode >= VK_SHIFT && iKeyCode <= VK_CAPITAL) ||
@@ -258,5 +258,5 @@
             iKeyCode == VK_PRINT);
 
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 
     return (IsModifierKey(iKeyCode) /* allow modifiers */ ||
@@ -276,5 +276,5 @@
 }
 
-#if defined(Q_WS_WIN)
+#if defined(VBOX_WS_WIN)
 
 int UINativeHotKey::distinguishModifierVKey(int wParam, int lParam)
@@ -317,5 +317,5 @@
 }
 
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
 
 void UINativeHotKey::retranslateKeyNames()
@@ -335,5 +335,5 @@
 }
 
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
 
@@ -470,12 +470,12 @@
     : m_pReleaseTimer(0)
     , m_fStartNewSequence(true)
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
 # if QT_VERSION >= 0x050000
     , m_pPrivateEventFilter(0)
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC || Q_WS_WIN */
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
+#ifdef VBOX_WS_WIN
     , m_pAltGrMonitor(0)
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 {
     /* Configure widget: */
@@ -490,5 +490,5 @@
     connect(m_pReleaseTimer, SIGNAL(timeout()), this, SLOT(sltReleasePendingKeys()));
 
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
 # if QT_VERSION >= 0x050000
     /* Prepare private event filter: */
@@ -496,7 +496,7 @@
     qApp->installNativeEventFilter(m_pPrivateEventFilter);
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC || Q_WS_WIN */
-
-#if defined(Q_WS_MAC)
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
+
+#if defined(VBOX_WS_MAC)
     m_uDarwinKeyModifiers = 0;
 # if QT_VERSION < 0x050000
@@ -504,27 +504,27 @@
     ::DarwinGrabKeyboard(false /* just modifiers */);
 # endif /* QT_VERSION < 0x050000 */
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
     /* Prepare AltGR monitor: */
     m_pAltGrMonitor = new WinAltGrMonitor;
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
     /* Initialize the X keyboard subsystem: */
     initMappedX11Keyboard(QX11Info::display(), vboxGlobal().settings().publicProperty("GUI/RemapScancodes"));
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 }
 
 UIHostComboEditorPrivate::~UIHostComboEditorPrivate()
 {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
 # if QT_VERSION < 0x050000
     ::DarwinReleaseKeyboard();
     UICocoaApplication::instance()->unregisterForNativeEvents(RT_BIT_32(10) | RT_BIT_32(11) | RT_BIT_32(12) /* NSKeyDown  | NSKeyUp | | NSFlagsChanged */, UIHostComboEditorPrivate::darwinEventHandlerProc, this);
 # endif /* QT_VERSION < 0x050000 */
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
     /* Cleanup AltGR monitor: */
     delete m_pAltGrMonitor;
     m_pAltGrMonitor = 0;
-#endif /* Q_WS_WIN */
-
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#endif /* VBOX_WS_WIN */
+
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
 # if QT_VERSION >= 0x050000
     /* Cleanup private event filter: */
@@ -533,5 +533,5 @@
     m_pPrivateEventFilter = 0;
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC || Q_WS_WIN */
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
 }
 
@@ -581,5 +581,5 @@
 bool UIHostComboEditorPrivate::nativeEvent(const QByteArray &eventType, void *pMessage, long *pResult)
 {
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
 
     /* Make sure it's generic NSEvent: */
@@ -637,5 +637,5 @@
     }
 
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
 
     /* Make sure it's generic MSG event: */
@@ -685,5 +685,5 @@
     }
 
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
 //#  pragma GCC diagnostic push
 //#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -728,5 +728,5 @@
 #else /* QT_VERSION < 0x050000 */
 
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
 
 /* static */
@@ -786,5 +786,5 @@
 }
 
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
 
 bool UIHostComboEditorPrivate::winEvent(MSG *pMsg, long* /* pResult */)
@@ -830,5 +830,5 @@
 }
 
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
 #  if RT_GNUC_PREREQ(4, 6)
 #   pragma GCC diagnostic push
@@ -862,5 +862,5 @@
 #   pragma GCC diagnostic pop
 #  endif
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 
 #endif /* QT_VERSION < 0x050000 */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.h	(revision 60362)
@@ -31,12 +31,12 @@
 class QIToolButton;
 class UIHostComboEditorPrivate;
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
 # if QT_VERSION >= 0x050000
 class ComboEditorEventFilter;
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC || Q_WS_WIN */
-#ifdef Q_WS_WIN
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
+#ifdef VBOX_WS_WIN
 class WinAltGrMonitor;
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
 
@@ -47,9 +47,9 @@
     QString toString(int iKeyCode);
     bool isValidKey(int iKeyCode);
-#if defined(Q_WS_WIN)
+#if defined(VBOX_WS_WIN)
     int distinguishModifierVKey(int wParam, int lParam);
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
     void retranslateKeyNames();
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 }
 
@@ -152,16 +152,16 @@
     bool nativeEvent(const QByteArray &eventType, void *pMessage, long *pResult);
 #else /* QT_VERSION < 0x050000 */
-# if defined(Q_WS_MAC)
+# if defined(VBOX_WS_MAC)
     /** Mac: Qt4: Handles all native events (static callback). */
     static bool darwinEventHandlerProc(const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
     /** Mac: Qt4: Handles all native events. */
     bool darwinKeyboardEvent(const void *pvCocoaEvent, EventRef inEvent);
-# elif defined(Q_WS_WIN)
+# elif defined(VBOX_WS_WIN)
     /** Win: Qt4: Handles all native events. */
     bool winEvent(MSG *pMsg, long *pResult);
-# elif defined(Q_WS_X11)
+# elif defined(VBOX_WS_X11)
     /** X11: Qt4: Handles all native events. */
     bool x11Event(XEvent *pEvent);
-# endif /* Q_WS_X11 */
+# endif /* VBOX_WS_X11 */
 #endif /* QT_VERSION < 0x050000 */
 
@@ -187,5 +187,5 @@
     bool m_fStartNewSequence;
 
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
 # if QT_VERSION >= 0x050000
     /** Mac, Win: Holds the native event filter instance. */
@@ -195,15 +195,15 @@
     friend class ComboEditorEventFilter;
 # endif /* QT_VERSION >= 0x050000 */
-#endif /* Q_WS_MAC || Q_WS_WIN */
-
-#if defined(Q_WS_MAC)
+#endif /* VBOX_WS_MAC || VBOX_WS_WIN */
+
+#if defined(VBOX_WS_MAC)
     /** Mac: Holds the current modifier key mask. Used to figure out which modifier
       * key was pressed when we get a kEventRawKeyModifiersChanged event. */
     uint32_t m_uDarwinKeyModifiers;
-#elif defined(Q_WS_WIN)
+#elif defined(VBOX_WS_WIN)
     /** Win: Holds the object monitoring key event
       * stream for problematic AltGr events. */
     WinAltGrMonitor *m_pAltGrMonitor;
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	(revision 60362)
@@ -272,10 +272,10 @@
 
     /* Left margin: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     if (vboxGlobal().isCompositingManagerRunning())
         m_spacings << widgetForAction(addWidget(new QWidget));
-#else /* !Q_WS_X11 */
+#else /* !VBOX_WS_X11 */
     m_spacings << widgetForAction(addWidget(new QWidget));
-#endif /* !Q_WS_X11 */
+#endif /* !VBOX_WS_X11 */
 
     /* Prepare push-pin: */
@@ -327,10 +327,10 @@
 
     /* Right margin: */
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     if (vboxGlobal().isCompositingManagerRunning())
         m_spacings << widgetForAction(addWidget(new QWidget));
-#else /* !Q_WS_X11 */
+#else /* !VBOX_WS_X11 */
     m_spacings << widgetForAction(addWidget(new QWidget));
-#endif /* !Q_WS_X11 */
+#endif /* !VBOX_WS_X11 */
 
     /* Resize to sizehint: */
@@ -340,8 +340,8 @@
 void UIMiniToolBarPrivate::rebuildShape()
 {
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     if (!vboxGlobal().isCompositingManagerRunning())
         return;
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Rebuild shape: */
@@ -496,8 +496,8 @@
         m_pEmbeddedToolbar->move(m_hiddenToolbarPosition);
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Adjust window mask: */
     setMask(m_pEmbeddedToolbar->geometry());
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Simulate toolbar auto-hiding: */
@@ -543,14 +543,14 @@
     installEventFilter(this);
 
-#if   defined(Q_WS_WIN)
+#if   defined(VBOX_WS_WIN)
     /* No background until first paint-event: */
     setAttribute(Qt::WA_NoSystemBackground);
     /* Enable translucency through Qt API: */
     setAttribute(Qt::WA_TranslucentBackground);
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
     /* Enable translucency through Qt API if supported: */
     if (vboxGlobal().isCompositingManagerRunning())
         setAttribute(Qt::WA_TranslucentBackground);
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 
     /* Make sure we have no focus: */
@@ -676,7 +676,7 @@
     if (pWatched == this && pEvent->type() == QEvent::WindowActivate)
     {
-#if   defined(Q_WS_WIN)
+#if   defined(VBOX_WS_WIN)
         emit sigNotifyAboutWindowActivationStolen();
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
         switch (vboxGlobal().typeOfWindowManager())
         {
@@ -698,5 +698,5 @@
             }
         }
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
     }
 
@@ -725,8 +725,8 @@
     m_pEmbeddedToolbar->move(point);
 
-#ifdef Q_WS_X11
+#ifdef VBOX_WS_X11
     /* Update window mask: */
     setMask(m_pEmbeddedToolbar->geometry());
-#endif /* Q_WS_X11 */
+#endif /* VBOX_WS_X11 */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp	(revision 60362)
@@ -30,7 +30,7 @@
 /* GUI includes: */
 # include "UIPopupBox.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "UIImageTools.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneTextPane.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneTextPane.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneTextPane.cpp	(revision 60362)
@@ -198,7 +198,7 @@
 QFont UIPopupPaneTextPane::tuneFont(QFont font)
 {
-#if defined(Q_WS_MAC)
+#if defined(VBOX_WS_MAC)
     font.setPointSize(font.pointSize() - 2);
-#elif defined(Q_WS_X11)
+#elif defined(VBOX_WS_X11)
     font.setPointSize(font.pointSize() - 1);
 #endif
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp	(revision 60362)
@@ -187,16 +187,16 @@
     /* Configure background: */
     setAutoFillBackground(false);
-#if defined(Q_WS_WIN) || defined (Q_WS_MAC)
+#if defined(VBOX_WS_WIN) || defined (VBOX_WS_MAC)
     /* Using Qt API to enable translucent background for the Win/Mac host.
      * - Under x11 host Qt 4.8.3 has it broken wih KDE 4.9 for now: */
     setAttribute(Qt::WA_TranslucentBackground);
-#endif /* Q_WS_WIN || Q_WS_MAC */
-
-#ifdef Q_WS_MAC
+#endif /* VBOX_WS_WIN || VBOX_WS_MAC */
+
+#ifdef VBOX_WS_MAC
     /* Do not hide popup-stack
      * and actually the seamless machine-window too
      * due to Qt bug on window deactivation... */
     setAttribute(Qt::WA_MacAlwaysShowToolWindow);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Prepare content: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp	(revision 60362)
@@ -580,9 +580,9 @@
     {
         /* Configure layout: */
-#ifndef Q_WS_WIN
+#ifndef VBOX_WS_WIN
         /* On Windows host that looks ugly, but
          * On Mac OS X and X11 that deserves it's place. */
         pMainLayout->setContentsMargins(0, 0, 0, 0);
-#endif /* !Q_WS_WIN */
+#endif /* !VBOX_WS_WIN */
         pMainLayout->setSpacing(3);
         /* Create model: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp	(revision 60362)
@@ -36,7 +36,7 @@
 # include "QILabel.h"
 # include "VBoxGlobal.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils-darwin.h"
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -68,5 +68,5 @@
     QHBoxLayout *pMainLayout = new QHBoxLayout(this);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     ::darwinSetHidesAllTitleButtons(this);
     if (pImage)
@@ -74,5 +74,5 @@
     else
         pMainLayout->setContentsMargins(6, 6, 6, 6);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* Create image: */
@@ -159,10 +159,10 @@
          * Apple there is no busy window behavior. A window should always be
          * responsive and it is in our case (We show the progress dialog bar). */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         if (m_fCancelEnabled)
             QApplication::setOverrideCursor(QCursor(Qt::BusyCursor));
         else
             QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
         /* Create a local event-loop: */
@@ -183,8 +183,8 @@
         killTimer(id);
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* Reset the busy cursor */
         QApplication::restoreOverrideCursor();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
         return result();
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp	(revision 60362)
@@ -149,5 +149,5 @@
     : QIWithRetranslateUI<QPushButton>(pParent)
 {
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     m_pButtonPressed = false;
     m_pNormalPixmap = new QPixmap(":/help_button_normal_mac_22px.png");
@@ -159,5 +159,5 @@
                     m_size.width(),
                     m_size.height());
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     /* Applying language settings */
     retranslateUi();
@@ -183,5 +183,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 UIHelpButton::~UIHelpButton()
 {
@@ -233,5 +233,5 @@
     update();
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /********************************************************************************
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h	(revision 60362)
@@ -187,8 +187,8 @@
 public:
     UIHelpButton(QWidget *pParent = 0);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     ~UIHelpButton();
     QSize sizeHint() const;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     void initFrom(QPushButton *pOther);
@@ -197,5 +197,5 @@
     void retranslateUi();
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     void paintEvent(QPaintEvent *pEvent);
 
@@ -215,5 +215,5 @@
     QImage *m_pMask;
     QRect m_BRect;
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp	(revision 60362)
@@ -26,9 +26,9 @@
 /* GUI includes: */
 # include "UIToolBar.h"
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
 #  include "VBoxUtils.h"
 # endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 /* Qt includes: */
@@ -59,5 +59,5 @@
 }
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
 void UIToolBar::enableMacToolbar()
 {
@@ -85,5 +85,5 @@
     layout()->activate();
 }
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 void UIToolBar::prepare()
@@ -100,7 +100,7 @@
         setStyleSheet("QToolBar { border: 0px none black; }");
 #else /* QT_VERSION >= 0x050000 */
-# ifdef Q_WS_MAC
+# ifdef VBOX_WS_MAC
         setStyleSheet("QToolBar { border: 0px none black; }");
-# endif /* Q_WS_MAC */
+# endif /* VBOX_WS_MAC */
 #endif /* QT_VERSION >= 0x050000 */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h	(revision 60362)
@@ -40,5 +40,5 @@
     void setUseTextLabels(bool fEnable);
 
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
     /** Mac OS X: Defines whether native tool-bar should be used. */
     void enableMacToolbar();
@@ -47,5 +47,5 @@
     /** Mac OS X: Updates native tool-bar layout. */
     void updateLayout();
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
 private:
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp	(revision 60362)
@@ -57,7 +57,7 @@
     CGuestOSType type = vboxGlobal().vmGuestOSType (aOSTypeId);
     /* Looks ugly on the Mac */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     setIcon (vboxGlobal().vmGuestOSTypeIcon (type.GetId()));
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
     setText (type.GetDescription());
 }
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp	(revision 60362)
@@ -107,5 +107,5 @@
             QPalette pal = palette();
             QColor buttonColor = pal.color(m_fParentSelected ? QPalette::HighlightedText : QPalette::Mid);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             /* Mac is using only light standard highlight colors, keeping highlight-text color always black.
              * User can choose a darker (non-standard) highlight color but it will be his visibility problem.
@@ -114,5 +114,5 @@
             if (m_fParentSelected)
                 buttonColor = pal.color(QPalette::Highlight).darker(150);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
             /* Setup: */
@@ -145,5 +145,5 @@
             QPalette pal = palette();
             QColor buttonColor = pal.color(m_fParentSelected ? QPalette::HighlightedText : QPalette::Mid);
-#ifdef Q_WS_MAC
+#ifdef VBOX_WS_MAC
             /* Mac is using only light standard highlight colors, keeping highlight-text color always black.
              * User can choose a darker (non-standard) highlight color but it will be his visibility problem.
@@ -152,5 +152,5 @@
             if (m_fParentSelected)
                 buttonColor = pal.color(QPalette::Highlight).darker(150);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
             /* Setup: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp	(revision 60362)
@@ -78,10 +78,10 @@
     , m_mode(mode == WizardMode_Auto ? gEDataManager->modeForWizardType(m_type) : mode)
 {
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     /* Hide window icon: */
     setWindowIcon(QIcon());
-#endif /* Q_WS_WIN */
-
-#ifdef Q_WS_MAC
+#endif /* VBOX_WS_WIN */
+
+#ifdef VBOX_WS_MAC
     /* Since wizards are now represented as Mac OS X Sheets
      * we would like to have possibility to cancel them. */
@@ -90,5 +90,5 @@
      * This prevents the using of Enter to jump to the next page. */
     setOptions(options() ^ QWizard::NoDefaultButton);
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 
     /* All our wizards would like to have window-modality,
@@ -170,9 +170,9 @@
     }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Cleanup watermark: */
     if (!m_strWatermarkName.isEmpty())
         setPixmap(QWizard::WatermarkPixmap, QPixmap());
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 }
 
@@ -247,17 +247,17 @@
         int iCurrentWizardWidth = width();
         int iCurrentWizardHeight = height();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* We should take into account watermark like its assigned already: */
         QPixmap watermarkPixmap(m_strWatermarkName);
         int iWatermarkWidth = watermarkPixmap.width();
         iCurrentWizardWidth += iWatermarkWidth;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
         /* Calculating nearest to 'golden ratio' label width: */
         int iGoldenRatioWidth = (int)qSqrt(ratio() * iCurrentWizardWidth * iCurrentWizardHeight);
         int iProposedLabelWidth = iGoldenRatioWidth - iMarginsLength;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
         /* We should take into account watermark like its assigned already: */
         iProposedLabelWidth -= iWatermarkWidth;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
         /* Choose maximum between current and proposed label width: */
@@ -269,21 +269,21 @@
     }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Really assign watermark: */
     if (!m_strWatermarkName.isEmpty())
         assignWatermarkHelper();
-#endif /* !Q_WS_MAC */
-}
-
-#ifndef Q_WS_MAC
+#endif /* !VBOX_WS_MAC */
+}
+
+#ifndef VBOX_WS_MAC
 void UIWizard::assignWatermark(const QString &strWatermark)
 {
     if (wizardStyle() != QWizard::AeroStyle
-# ifdef Q_WS_WIN
+# ifdef VBOX_WS_WIN
         /* There is a Qt bug about Windows7 do NOT match conditions for 'aero' wizard-style,
          * so its silently fallbacks to 'modern' one without any notification,
          * so QWizard::wizardStyle() returns QWizard::ModernStyle, while using aero, at least partially. */
         && QSysInfo::windowsVersion() != QSysInfo::WV_WINDOWS7
-# endif /* Q_WS_WIN */
+# endif /* VBOX_WS_WIN */
         )
         m_strWatermarkName = strWatermark;
@@ -373,5 +373,5 @@
     double dRatio = 1.6;
 
-#ifdef Q_WS_WIN
+#ifdef VBOX_WS_WIN
     switch (wizardStyle())
     {
@@ -392,5 +392,5 @@
             break;
     }
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WS_WIN */
 
     switch (m_type)
@@ -417,5 +417,5 @@
 }
 
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
 int UIWizard::proposedWatermarkHeight()
 {
@@ -516,4 +516,4 @@
     setPixmap(QWizard::WatermarkPixmap, pixWatermarkNew);
 }
-#endif /* !Q_WS_MAC */
-
+#endif /* !VBOX_WS_MAC */
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h	(revision 60362)
@@ -67,5 +67,5 @@
 
     /* Design stuff: */
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     void assignWatermark(const QString &strWaterMark);
 #else
@@ -82,15 +82,15 @@
     void resizeAccordingLabelWidth(int iLabelWidth);
     double ratio();
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     int proposedWatermarkHeight();
     void assignWatermarkHelper();
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 
     /* Variables: */
     WizardType m_type;
     WizardMode m_mode;
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     QString m_strWatermarkName;
-#endif /* !Q_WS_MAC */
+#endif /* !VBOX_WS_MAC */
 };
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp	(revision 60362)
@@ -43,11 +43,11 @@
     , m_sourceVirtualDisk(sourceVirtualDisk)
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Assign watermark: */
     assignWatermark(":/vmw_new_harddisk.png");
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Assign background image: */
     assignBackground(":/vmw_new_harddisk_bg.png");
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp	(revision 60362)
@@ -40,11 +40,11 @@
     , m_snapshot(snapshot)
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Assign watermark: */
     assignWatermark(":/vmw_clone.png");
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Assign background image: */
     assignBackground(":/vmw_clone_bg.png");
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp	(revision 60362)
@@ -47,11 +47,11 @@
     , m_selectedVMNames(selectedVMNames)
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Assign watermark: */
     assignWatermark(":/vmw_ovf_export.png");
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Assign background image: */
     assignBackground(":/vmw_ovf_export_bg.png");
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp	(revision 60362)
@@ -39,11 +39,11 @@
     , m_fHardDiskWasSet(isBootHardDiskAttached(m_machine))
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Assign watermark: */
     assignWatermark(":/vmw_first_run.png");
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Assign background image: */
     assignBackground(":/vmw_first_run_bg.png");
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp	(revision 60362)
@@ -145,11 +145,11 @@
     , m_strFileName(strFileName)
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Assign watermark: */
     assignWatermark(":/vmw_ovf_import.png");
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Assign background image: */
     assignBackground(":/vmw_ovf_import_bg.png");
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp	(revision 60362)
@@ -48,11 +48,11 @@
     , m_uDefaultSize(uDefaultSize)
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Assign watermark: */
     assignWatermark(":/vmw_new_harddisk.png");
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Assign background image: */
     assignBackground(":/vmw_new_harddisk_bg.png");
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 60361)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 60362)
@@ -53,11 +53,11 @@
     , m_iUSBCount(0)
 {
-#ifndef Q_WS_MAC
+#ifndef VBOX_WS_MAC
     /* Assign watermark: */
     assignWatermark(":/vmw_new_welcome.png");
-#else /* Q_WS_MAC */
+#else /* VBOX_WS_MAC */
     /* Assign background image: */
     assignBackground(":/vmw_new_welcome_bg.png");
-#endif /* Q_WS_MAC */
+#endif /* VBOX_WS_MAC */
 }
 
