3 files changed, 12 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 657295c29c..de27175bbd 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -707,6 +707,7 @@ void qt_mac_cleanUpMacColorSpaces()
 CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintDevice)
 {
 #ifdef QT_NO_WIDGETS
+    Q_UNUSED(paintDevice)
     return qt_mac_displayColorSpace(0);
 #else
     bool isWidget = (paintDevice->devType() == QInternal::Widget);
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index f776f746de..542a26d409 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -157,6 +157,7 @@ void *QCocoaNativeInterface::NSPrintInfoForPrintEngine(QPrintEngine *printEngine
         macPrintEnginePriv->initialize();
     return macPrintEnginePriv->printInfo;
 #else
+    Q_UNUSED(printEngine);
     qFatal("Printing is not supported when Qt is configured with -no-widgets");
     return 0;
 #endif
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 528e6f120f..7f13961897 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -439,16 +439,17 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wobjc-method-access")
         enum { NSWindowOcclusionStateVisible = 1UL << 1 };
 #endif
-        if ((NSUInteger)[self.window occlusionState] & NSWindowOcclusionStateVisible) {
-            m_platformWindow->exposeWindow();
-        } else {
-            // Send Obscure events on window occlusion to stop animations. Several
-            // unit tests expect paint and/or expose events for windows that are
-            // sometimes (unpredictably) occlouded: Don't send Obscure events when
-            // running under QTestLib.
-            static bool onTestLib = qt_mac_resolveOption(false, "QT_QTESTLIB_RUNNING");
-            if (!onTestLib)
+        // Several unit tests expect paint and/or expose events for windows that are
+        // sometimes (unpredictably) occluded and some unit tests depend on QWindow::isExposed -
+        // don't send Expose/Obscure events when running under QTestLib.
+        static const bool onTestLib = qt_mac_resolveOption(false, "QT_QTESTLIB_RUNNING");
+        if (!onTestLib) {
+            if ((NSUInteger)[self.window occlusionState] & NSWindowOcclusionStateVisible) {
+                m_platformWindow->exposeWindow();
+            } else {
+                // Send Obscure events on window occlusion to stop animations.
                 m_platformWindow->obscureWindow();
+            }
         }
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9
 QT_WARNING_POP