Changeset 59098 in vbox

Timestamp:

Dec 11, 2015 3:44:59 PM (9 years ago)

Author:

vboxsync

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

104664

Message:

FE/Qt: Qt5 migration (part 39): More Mac OS X imports with Qt5.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin

Files:

• UICocoaSpecialControls.mm (modified) (2 diffs)
• VBoxUtils-darwin-cocoa.mm (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm

@@ -29 +29 @@
 #import <AppKit/NSImage.h>
 #import <AppKit/NSSegmentedControl.h>
+#if QT_VERSION >= 0x050000
+# import <AppKit/NSEvent.h>
+# import <AppKit/NSColor.h>
+# import <AppKit/NSSearchFieldCell.h>
+# import <AppKit/NSSearchField.h>
+# import <AppKit/NSSegmentedCell.h>
+#endif /* QT_VERSION >= 0x050000 */
 
 /* Qt includes */
@@ -35 +42 @@
 #include <QKeyEvent>
 #include <QMacCocoaViewContainer>
+
+/* Interface Builder Constant,
+ * hmm, where is it declared with Qt4? */
+#if QT_VERSION >= 0x050000
+# define IBAction void
+#endif /* QT_VERSION >= 0x050000 */
 
 /*

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

@@ -26 +26 @@
 #import <AppKit/NSColor.h>
 #import <AppKit/NSFont.h>
+#if QT_VERSION >= 0x050000
+# import <AppKit/NSScreen.h>
+# import <AppKit/NSWindow.h>
+# import <AppKit/NSImageView.h>
+#endif /* QT_VERSION >= 0x050000 */
 
 #import <objc/objc-class.h>