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/3rdparty/qocoa/qbutton.h
+++ b/3rdparty/qocoa/qbutton.h
@@ -3,7 +3,6 @@

 #include <QWidget>
 #include <QPointer>
-#include <QString>

 class QButtonPrivate;
 class QButton : public QWidget
@@ -24,7 +23,7 @@ public:
       RoundRect         = 12,
       Recessed          = 13,
       RoundedDisclosure = 14,
-#ifdef MAC_OS_X_VERSION_10_7
+#ifdef __MAC_10_7
       Inline            = 15
 #endif
    };