diff options
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenubar.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenubar.mm | 4 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 1 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.h b/src/plugins/platforms/cocoa/qcocoamenubar.h index 06e8eb6c9d..ef48c84712 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.h +++ b/src/plugins/platforms/cocoa/qcocoamenubar.h @@ -58,7 +58,7 @@ public: virtual void insertMenu(QPlatformMenu *menu, QPlatformMenu* before); virtual void removeMenu(QPlatformMenu *menu); - virtual void syncMenu(QPlatformMenuItem *menuItem); + virtual void syncMenu(QPlatformMenu *menuItem); virtual void handleReparent(QWindow *newParentWindow); virtual QPlatformMenu *menuForTag(quintptr tag) const; diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm index fc403ba504..dd22e61c45 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.mm +++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm @@ -113,9 +113,9 @@ void QCocoaMenuBar::removeMenu(QPlatformMenu *platformMenu) [m_nativeMenu removeItemAtIndex: realIndex]; } -void QCocoaMenuBar::syncMenu(QPlatformMenuItem *menuItem) +void QCocoaMenuBar::syncMenu(QPlatformMenu *menu) { - Q_UNUSED(menuItem); + Q_UNUSED(menu); } void QCocoaMenuBar::handleReparent(QWindow *newParentWindow) diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index 06d1f9ee0f..91461f279a 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -92,6 +92,7 @@ void *QCocoaNativeInterface::NSPrintInfoForPrintEngine(QPrintEngine *printEngine void QCocoaNativeInterface::onAppFocusWindowChanged(QWindow *window) { + Q_UNUSED(window); QCocoaMenuBar::updateMenuBarImmediately(); } diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index 2f630c7763..0eb2136027 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -52,8 +52,8 @@ #include "qcocoamenubar.h" #include <QtGui/private/qguiapplication_p.h> -#include <QtGui/QPlatformIntegration> -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE |