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

Timestamp:

Nov 26, 2015 1:46:50 PM (9 years ago)

Author:

vboxsync

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

104371

Message:

FE/Qt: Qt5 migration (part 22): Weird Qt5 vs Xlib conflict.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -64 +64 @@
 # include <QX11Info>
 # include <X11/Xlib.h>
+# if QT_VERSION >= 0x050000
+#  undef Bool // Qt5 vs Xlib gift..
+# endif /* QT_VERSION >= 0x050000 */
 #endif /* Q_WS_X11 */