mumble: fix Mac build after the overlay header refactoring.

mumble-voip · Feb 25, 2014 · 487fcab · 487fcab
1 parent d41c148
commit 487fcab
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/src/mumble/GlobalShortcut_macx.mm b/src/mumble/GlobalShortcut_macx.mm
@@ -33,7 +33,7 @@
 #import <Carbon/Carbon.h>
 
 #include "GlobalShortcut_macx.h"
-#include "Overlay.h"
+#include "OverlayClient.h"
 
 #define MOD_OFFSET   0x10000
 #define MOUSE_OFFSET 0x20000

diff --git a/src/mumble/Overlay.h b/src/mumble/Overlay.h
@@ -34,6 +34,11 @@
 #include <QtCore/QtGlobal>
 #include <QtCore/QUrl>
 #include <QtNetwork/QLocalSocket>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+# include <QtWidgets/QGraphicsItem>
+#else
+# include <QtGui/QGraphicsItem>
+#endif
 
 #include "ConfigDialog.h"
 #include "OverlayText.h"

diff --git a/src/mumble/OverlayClient.h b/src/mumble/OverlayClient.h
@@ -32,11 +32,6 @@
 #define MUMBLE_MUMBLE_OVERLAYCLIENT_H_
 
 #include <QtCore/QUrl>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-# include <QtWidgets/QGraphicsItem>
-#else
-# include <QtGui/QGraphicsItem>
-#endif
 #include <QtNetwork/QLocalSocket>
 
 #include "Timer.h"

diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h
@@ -31,6 +31,9 @@
 #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_
 #define MUMBLE_MUMBLE_OVERLAYTEXT_H_
 
+#include <QtGui/QPixmap>
+#include <QtGui/QFont>
+
 //! Annotated QPixmap supplying a basepoint.
 class BasepointPixmap : public QPixmap {
 	public:

diff --git a/src/mumble/Overlay_macx.mm b/src/mumble/Overlay_macx.mm
@@ -33,7 +33,8 @@
 #import <ScriptingBridge/ScriptingBridge.h>
 #import <Cocoa/Cocoa.h>
 #include <Carbon/Carbon.h>
-#include "Overlay.h"
+#include "OverlayConfig.h"
+#include "OverlayClient.h"
 #include "Global.h"
 #include "MainWindow.h"