Changeset 64762 in vbox for trunk/src/VBox

Timestamp:

Nov 28, 2016 3:49:53 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Do not directly include QtGlobal, within latest Qt5 it causes OSX to undefine QT_VERSION macro which we directly defined (s.a. r111568) to make OSX moc see ifdefed signals and slots.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QILineEdit.cpp (modified) (6 diffs)
• precomp.h (modified) (1 diff)
• runtime/UIKeyboardHandler.h (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
-# include <QtGlobal>                    /* for QT_VERSION */
-# if QT_VERSION < 0x050000
-#  ifdef VBOX_WS_WIN
+# ifdef VBOX_WS_WIN
+#  include <QtGlobal> /* for QT_VERSION */
+#  if QT_VERSION < 0x050000
 #   include <QLibrary>
 #  endif
@@ -32 +32 @@
 
 /* Other VBox includes: */
-# if QT_VERSION < 0x050000
-#  ifdef VBOX_WS_WIN
+# ifdef VBOX_WS_WIN
+#  if QT_VERSION < 0x050000
 #   include "iprt/ldr.h"
 #  endif
@@ -39 +39 @@
 
 /* External includes: */
-# if QT_VERSION < 0x050000
-#  ifdef VBOX_WS_WIN
+# ifdef VBOX_WS_WIN
+#  if QT_VERSION < 0x050000
 #   include <iprt/win/windows.h>
 #  endif
@@ -49 +49 @@
 /* Qt includes: */
 #include <QStyleOptionFrame>
-#if QT_VERSION < 0x050000
-# ifdef VBOX_WS_WIN
+#ifdef VBOX_WS_WIN
+# if QT_VERSION < 0x050000
 #  include <QWindowsVistaStyle>
 # endif
@@ -81 +81 @@
     QSize sa = style()->sizeFromContents (QStyle::CT_LineEdit, &sof, sc, this);
 
-#if QT_VERSION < 0x050000
-# ifdef VBOX_WS_WIN
+#ifdef VBOX_WS_WIN
+# if QT_VERSION < 0x050000
     /* Vista l&f style has a bug where the last parameter of sizeFromContents
      * function ('widget' what corresponds to 'this' in our class) is ignored.
@@ -99 +99 @@
             sa -= QSize(23, 0);
     }
-# endif /* VBOX_WS_WIN */
-#endif /* QT_VERSION < 0x050000 */
+# endif /* QT_VERSION < 0x050000 */
+#endif /* VBOX_WS_WIN */
 
     return sa;

trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

@@ -212 +212 @@
 //#include <QXmlStreamReader> - only used once
 //#include <QXmlStreamWriter> - only used once
-#include <QtGlobal>
 
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h

@@ -20 +20 @@
 
 /* Qt includes: */
-#include <QtGlobal>
 #include <QMap>
 #include <QObject>

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -20 +20 @@
 
 /* Qt includes: */
-#include <QtGlobal> /* for VBOX_WS_MAC */
 #ifdef VBOX_WS_MAC
 /* Somewhere Carbon.h includes AssertMacros.h which defines the macro "check".