summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa/qnsview.mm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 5.8 into devTor Arne Vestbø2016-10-181-76/+78
|\
| * macOS: Remove QNSView member m_window in favor of going via m_platformWindowTor Arne Vestbø2016-10-131-70/+78
| * macOS: Use QPointer to track QNSView -> QCocoaWindowTor Arne Vestbø2016-10-131-6/+0
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-131-17/+20
|\|
| * macOS: Get rid of m_qtView member in QCocoaWindow that aliased m_viewTor Arne Vestbø2016-10-101-2/+2
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-061-3/+6
| |\
| | * Cocoa: Don’t send tablet events as mouse eventsMorten Johan Sørvig2016-10-031-3/+6
| * | Replace QCFString::to(CF/NS/Q)String usage with QString methodsTor Arne Vestbø2016-10-061-7/+7
| * | macOS: Rename m_contentView to m_view, to distinguish from [NSWindow contentV...Tor Arne Vestbø2016-10-051-5/+5
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-291-9/+9
|\| |
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-291-9/+9
| |\|
| | * Cocoa: Get mouse position from the eventMorten Johan Sørvig2016-09-271-9/+9
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-261-2/+12
|\| |
| * | Cocoa: Add drawBackingStoreUsingCoreGraphicsMorten Johan Sørvig2016-09-221-2/+12
* | | macOS: fix 32-bit buildsJake Petroules2016-09-211-3/+3
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-2/+3
|\| |
| * | macOS: Implement QCocoaBackingStore in terms of QRasterBackingStoreTor Arne Vestbø2016-09-181-2/+2
| * | macOS: Move image conversion functions to QtGuiTor Arne Vestbø2016-09-181-0/+1
* | | Replace usages of QSysInfo with QOperatingSystemVersionJake Petroules2016-09-201-1/+1
|/ /
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-11/+22
|\|
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-11/+22
| |\
| | * Cocoa: Update deprecated dragging session APIsGabriel de Dietrich2016-08-111-10/+13
| | * Drag and Drop: Don't let Cocoa override proposed actionsGabriel de Dietrich2016-08-111-1/+9
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-011-4/+10
|\| |
| * | Cocoa: Don’t beep on return keypressMorten Johan Sørvig2016-07-291-4/+10
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-191-1/+2
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-151-1/+2
| |\|
| | * [macOS] Check that the screen's index is still valid after updatingAndy Shaw2016-07-081-1/+2
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-131-4/+14
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-061-4/+14
| |\|
| | * Cocoa QPA: Mute mouse dragging warningsGabriel de Dietrich2016-06-041-3/+3
| | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-021-3/+9
| | |\
| | | * QNSView: Pass on the responder chain if deletion is pendingGabriel de Dietrich2016-05-201-3/+9
| | * | QNSView: Reset the internal buttons state after dragging endsGabriel de Dietrich2016-05-241-1/+5
| | |/
* | | darwin: Add Foundation conversion functions for QRect/QRectFTor Arne Vestbø2016-06-101-5/+5
* | | Remove all code paths related to unsupported Apple platforms.Jake Petroules2016-06-041-44/+7
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-231-1/+2
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+2
| |\|
| | * Cocoa: Add QCocoaWindowPointerGabriel de Dietrich2016-05-061-1/+1
| | * Cocoa: Clear the backing store pointer when changing windowGabriel de Dietrich2016-05-061-0/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-121-7/+37
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-061-1/+5
| |\|
| | * Cocoa: Enable skipping Ctrl+LMB to RMB overrideGabriel de Dietrich2016-05-031-1/+5
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-291-3/+3
| |\|
| | * OSX: mark mouse events from tablet devices as synthesizedShawn Rutledge2016-04-261-5/+7
| * | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-04-261-1/+25
| |\ \
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-251-1/+25
| | |\|
| | | * Fix gesture processing on OS X 10.11Timur Pocheptsov2016-04-151-1/+25
| * | | OSX: remove tablet->mouse event synthShawn Rutledge2016-04-251-4/+6
| |/ /
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-031-2/+3
|\| |