Merge branch 'master' of https://github.com/fluxer/katie

src/gui/accessible/qaccessible_mac.mm

@@ -2455,4 +2455,6 @@ void QAccessible::updateAccessibility(QObject *object, int child, Event reason)
 
 QT_END_NAMESPACE
 
+#include "moc_qaccessible_mac_p.h"
+
 #endif // QT_NO_ACCESSIBILITY

src/gui/accessible/qaccessible_mac_p.h

@@ -444,7 +444,7 @@ public:
 */
 class Q_AUTOTEST_EXPORT QAccessibleHierarchyManager : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 public:
     ~QAccessibleHierarchyManager() { reset(); }
     static QAccessibleHierarchyManager *instance();

src/gui/kernel/kernel.cmake

@@ -225,6 +225,9 @@ elseif(KATIE_PLATFORM STREQUAL "mac")
         ${KATIE_LDFLAGS}
         -framework AppKit
         -framework Carbon
-        -lz
+    )
+    set(EXTRA_GUI_LIBS
+        ${EXTRA_GUI_LIBS}
+        ${ZLIB_LIBRARIES}
     )
 endif()

src/gui/kernel/qwidget.cpp

@@ -12150,8 +12150,6 @@ void QWidgetPrivate::syncUnifiedMode() {
 
 QT_END_NAMESPACE
 
-
-
 #include "moc_qwidget.h"
 
 

src/gui/styles/qmacstyle_mac.h

@@ -52,17 +52,10 @@ QT_BEGIN_NAMESPACE
 #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
 
 class QPalette;
-
-#if defined(QT_PLUGIN)
-#define Q_GUI_EXPORT_STYLE_MAC
-#else
-#define Q_GUI_EXPORT_STYLE_MAC Q_GUI_EXPORT
-#endif
-
 class QPushButton;
 class QStyleOptionButton;
 class QMacStylePrivate;
-class Q_GUI_EXPORT_STYLE_MAC QMacStyle : public QWindowsStyle
+class Q_GUI_EXPORT QMacStyle : public QWindowsStyle
 {
     Q_OBJECT
 public:

src/gui/text/qfontengine.cpp

@@ -759,7 +759,7 @@ QFontEngineGlyphCache *QFontEngine::glyphCache(void *key, QFontEngineGlyphCache:
     return 0;
 }
 
-#if defined(Q_WS_WIN) || defined(Q_WS_X11)
+#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_MAC)
 static inline QFixed kerning(int left, int right, const QFontEngine::KernPair *pairs, int numPairs)
 {
     uint left_right = (left << 16) + right;

src/gui/widgets/qmaccocoaviewcontainer_mac.mm

@@ -188,3 +188,5 @@ void QMacCocoaViewContainer::setCocoaView(void *cocoaViewToWrap)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qmaccocoaviewcontainer_mac.h"

src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp

@@ -445,3 +445,5 @@ QByteArray QAudioDeviceInfoInternal::defaultInputDevice()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qaudiodeviceinfo_win32_p.h"

src/multimedia/audio/qaudioinput_win32_p.cpp

@@ -632,3 +632,5 @@ void InputPrivate::trigger()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qaudioinput_win32_p.h"

src/multimedia/audio/qaudiooutput_win32_p.cpp

@@ -51,7 +51,7 @@
 //
 
 #include "qaudiooutput_win32_p.h"
-#include <QtEndian>
+#include "qendian.h"
 
 #ifndef SPEAKER_FRONT_LEFT
     #define SPEAKER_FRONT_LEFT            0x00000001
@@ -726,3 +726,5 @@ qint64 OutputPrivate::writeData(const char* data, qint64 len)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qaudiooutput_win32_p.h"