diff options
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.mm | 2 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoainputcontext.mm | 1 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qmacmime.mm | 1 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 5 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qpaintengine_mac.mm | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index 3e79ea49c6..5037236ea6 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -356,7 +356,7 @@ Qt::DropActions qt_mac_mapNSDragOperations(NSDragOperation nsActions) Qt::DropActions actions = Qt::IgnoreAction; for (int i=0; dnd_enums[i].mac_code; i++) { - if ((dnd_enums[i].mac_code == NSDragOperationEvery)) + if (dnd_enums[i].mac_code == NSDragOperationEvery) continue; if (nsActions & dnd_enums[i].mac_code) diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.mm b/src/plugins/platforms/cocoa/qcocoainputcontext.mm index 5ac7f72acf..83d2b9e7b0 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.mm @@ -122,6 +122,7 @@ void QCocoaInputContext::connectSignals() void QCocoaInputContext::focusObjectChanged(QObject *focusObject) { + Q_UNUSED(focusObject); mWindow = QGuiApplication::focusWindow(); } diff --git a/src/plugins/platforms/cocoa/qmacmime.mm b/src/plugins/platforms/cocoa/qmacmime.mm index 2895d7dda8..4c63e64bd7 100644 --- a/src/plugins/platforms/cocoa/qmacmime.mm +++ b/src/plugins/platforms/cocoa/qmacmime.mm @@ -173,6 +173,7 @@ QMacPasteboardMime::~QMacPasteboardMime() */ int QMacPasteboardMime::count(QMimeData *mimeData) { + Q_UNUSED(mimeData); return 1; } diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 3f43c1dfa2..72b948912a 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -335,7 +335,7 @@ static QTouchDevice *touchDevice = 0; int windowHeight = [window frame].size.height; NSPoint windowPoint = [theEvent locationInWindow]; NSPoint nsViewPoint = [self convertPoint: windowPoint fromView: nil]; - QPoint qtWindowPoint = QPoint(windowPoint.x, windowHeight - windowPoint.y); + QPoint qtWindowPoint = QPoint(nsViewPoint.x, windowHeight - nsViewPoint.y); NSPoint screenPoint = [window convertBaseToScreen : windowPoint]; QPoint qtScreenPoint = QPoint(screenPoint.x, qt_mac_flipYCoordinate(screenPoint.y)); @@ -1079,6 +1079,7 @@ static QTouchDevice *touchDevice = 0; - (void)draggedImage:(NSImage*) img endedAt:(NSPoint) point operation:(NSDragOperation) operation { + Q_UNUSED(img); QCocoaDrag* nativeDrag = static_cast<QCocoaDrag *>(QGuiApplicationPrivate::platformIntegration()->drag()); nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); @@ -1087,7 +1088,7 @@ static QTouchDevice *touchDevice = 0; m_buttons &= QFlag(~int(Qt::LeftButton)); NSPoint windowPoint = [self convertPoint: point fromView: nil]; - QPoint qtWindowPoint(point.x, point.y); + QPoint qtWindowPoint(windowPoint.x, windowPoint.y); NSWindow *window = [self window]; NSPoint screenPoint = [window convertBaseToScreen :point]; diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm index 3eaf327144..57756e7289 100644 --- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm @@ -154,7 +154,6 @@ QMacCGContext::QMacCGContext(QPainter *p) if (devType == QInternal::Widget) { QRegion clip = p->paintEngine()->systemClip(); QTransform native = p->deviceTransform(); - QTransform logical = p->combinedTransform(); if (p->hasClipping()) { QRegion r = p->clipRegion(); |