diff --git a/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h b/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
index 50c75c395..7d3e0d7af 100644
--- a/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
+++ b/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h
@@ -24,10 +24,15 @@ THE SOFTWARE.
 #define QCOCOA_MAC_H
 
 #import <Cocoa/Cocoa.h>
+#include <AppKit/NSImage.h>
 #include <QString>
 #include <QVBoxLayout>
 #include <QMacCocoaViewContainer>
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <qmacfunctions.h>
+#endif
+
 static inline NSString* fromQString(const QString &string)
 {
     const QByteArray utf8 = string.toUtf8();
@@ -44,11 +49,16 @@ static inline QString toQString(NSString *string)
 
 static inline NSImage* fromQPixmap(const QPixmap &pixmap)
 {
-    CGImageRef cgImage = pixmap.toMacCGImageRef();
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+     CGImageRef cgImage = pixmap.toMacCGImageRef();
+#else
+    CGImageRef cgImage = QtMac::toCGImageRef(pixmap);
+#endif
+
     return [[[NSImage alloc] initWithCGImage:cgImage size:NSZeroSize] autorelease];
 }
 
-static inline void setupLayout(void *cocoaView, QWidget *parent)
+static inline void setupLayout(NSView *cocoaView, QWidget *parent)
 {
     parent->setAttribute(Qt::WA_NativeWindow);
     QVBoxLayout *layout = new QVBoxLayout(parent);
diff --git a/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog_mac.mm b/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog_mac.mm
index 316e87f9d..a5ae0976a 100644
--- a/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog_mac.mm
+++ b/src/libtomahawk/thirdparty/Qocoa/qtoolbartabdialog_mac.mm
@@ -215,7 +215,7 @@ public:
         q.data()->accepted();
     }
 
-    QWeakPointer<QToolbarTabDialog> q;
+    QPointer<QToolbarTabDialog> q;
 
     NSWindow* prefsWindow;
     ToolbarDelegate *toolBarDelegate;