Skip to content
Permalink
Browse files

mumble: fix Mac build after the overlay header refactoring.

  • Loading branch information...
mkrautz authored and Kissaki committed Feb 24, 2014
1 parent d41c148 commit 487fcab9556cab40e1ac4379432f8f8f2475fc2e
@@ -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
@@ -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"
@@ -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"
@@ -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:
@@ -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"

0 comments on commit 487fcab

Please sign in to comment.
You can’t perform that action at this time.