summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-124-9/+49
|\
| * 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-292-4/+4
| |\|
| | * QCocoaMenu: Have the menu delegate return the right amount of itemsGabriel de Dietrich2016-04-271-1/+1
| | * OSX: mark mouse events from tablet devices as synthesizedShawn Rutledge2016-04-262-6/+8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-272-2/+10
| |\|
| | * Cocoa integration - add a protection against dangling pointersTimur Pocheptsov2016-04-222-2/+10
| * | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-04-262-1/+34
| |\ \
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-252-1/+34
| | |\|
| | | * Fix gesture processing on OS X 10.11Timur Pocheptsov2016-04-151-1/+25
| | | * OS X: Fix available geometry at startup when menu bar is hiddenTor Arne Vestbø2016-04-131-0/+9
| * | | OSX: remove tablet->mouse event synthShawn Rutledge2016-04-253-5/+8
| |/ /
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-031-2/+3
|\| |
| * | Cocoa integration - invert 'masked out event' logicTimur Pocheptsov2016-04-131-2/+2
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-131-0/+1
| |\|
| | * QNSView: Disable focus ringGabriel de Dietrich2016-04-111-0/+1
* | | Add QPlatformBackingStore::toImage() implementationsAndy Nichols2016-04-301-4/+1
* | | Keep QColorDialog::ShowAlphaChannel from expanding the dialog on OS X.Steve Mokris2016-04-271-1/+9
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-056-18/+44
|\| |
| * | Cocoa integration - hitTest for Qt::WindowTransparentForInputTimur Pocheptsov2016-03-301-0/+10
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-03-235-18/+34
| |\|
| | * QCocoaMenus: Use mix-in pattern to implement menu hierarchyGabriel de Dietrich2016-03-225-18/+34
* | | Use quotes instead of angle brackets for local includes in cocoa plugin.Jake Petroules2016-04-012-5/+5
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-03-2220-249/+383
|\| |
| * | Cocoa: Forward masked out mouse events.Morten Johan Sørvig2016-03-212-4/+29
| * | Cocoa: Forward rejected key events.Morten Johan Sørvig2016-03-212-6/+47
| * | Cocoa: Unify mouse handling logicMorten Johan Sørvig2016-03-212-66/+106
| * | Cocoa: Move window logging to qt.qpa.cocoa.windowMorten Johan Sørvig2016-03-216-34/+48
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-219-125/+132
| |\|
| | * QCocoaMenu: Decouple NSMenuItem from NSMenuGabriel de Dietrich2016-03-166-121/+111
| | * Compile with -no-openglMorten Johan Sørvig2016-03-151-0/+4
| | * Cocoa: Fix crash on screen disconnect.Morten Johan Sørvig2016-03-151-3/+7
| | * Cocoa: Improve native view lifetime accuracy.Morten Johan Sørvig2016-03-111-1/+10
| * | QWheelEvent: Make NoScrollPhase publicGabriel de Dietrich2016-03-211-2/+0
| * | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-03-133-7/+13
| |\ \
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-113-7/+13
| | |\|
| | | * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-03-071-5/+5
| | | * QWheelEvent: make NoScrollPhase opt-inShawn Rutledge2016-03-051-0/+2
| | | * Cocoa integration - do not invalidate backing store on moveTimur Pocheptsov2016-03-041-1/+3
| | | * QMacStyle and QCocoaTheme: Fix selected item color for non-native menubarGabriel de Dietrich2016-02-291-1/+3
| * | | QtBase (remainder): use printf-style qWarning/qDebug where possible (I)Marc Mutz2016-03-123-6/+6
| |/ /
| * | Add QWheelEvent::inverted()Morten Johan Sørvig2016-03-061-1/+3
| * | Simplify and speed up code resolving gl functionsLars Knoll2016-03-021-1/+2
| * | Avoid repeated QByteArray creation when resolving opengl functionsLars Knoll2016-03-012-2/+2
* | | QtOpenGL/plugins/platformsupport: use new QRegion::begin()/end() instead of r...Marc Mutz2016-03-024-20/+9
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-03-013-9/+22
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-292-2/+13
| |\|
| | * Track target widget when wheel events are receivedGabriel de Dietrich2016-02-291-0/+2
| | * QMacPrintEngine: Really set the printer resolutionKai Pastor2016-02-251-2/+11