Fix macos build

2018-07-01 22:26:46 +02:00
parent c4e75dea65
commit ada7325a04
51 changed files with 453 additions and 399 deletions
--- a/src/core/systemtrayicon.cpp
+++ b/src/core/systemtrayicon.cpp
@@ -30,8 +30,11 @@
 #include <QRect>
 #include <QVector>

-#include "qtsystemtrayicon.h"
 #include "systemtrayicon.h"
+#include "qtsystemtrayicon.h"
+#ifdef Q_OS_MACOS
+#  include "macsystemtrayicon.h"
+#endif

 SystemTrayIcon::SystemTrayIcon(QObject *parent)
  : QObject(parent),
@@ -103,7 +106,7 @@ void SystemTrayIcon::SetStopped() {
 }

 SystemTrayIcon* SystemTrayIcon::CreateSystemTrayIcon(QObject *parent) {
-#ifdef Q_OS_DARWIN
+#ifdef Q_OS_MACOS
  return new MacSystemTrayIcon(parent);
 #else
  return new QtSystemTrayIcon(parent);