summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa
Commit message (Expand)AuthorAgeFilesLines
* macOS: Fix crash in QCocoaBackingStore::format() after closing windowTor Arne Vestbø2016-10-271-1/+2
* Update main/primary screen term usageMorten Johan Sørvig2016-10-241-5/+5
* macOS: Remove unneeded argument to QCocoaWindow::recreateWindow()Tor Arne Vestbø2016-10-212-6/+8
* Merge branch 5.8 into devTor Arne Vestbø2016-10-189-130/+108
|\
| * macOS: Remove workaround for including AppKit.h with slots definedTor Arne Vestbø2016-10-135-40/+25
| * macOS: Remove QNSView member m_window in favor of going via m_platformWindowTor Arne Vestbø2016-10-134-75/+82
| * macOS: Use QPointer to track QNSView -> QCocoaWindowTor Arne Vestbø2016-10-133-15/+1
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-1327-290/+246
|\|
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-111-9/+7
| |\
| | * Revert "QCocoaKeyMapper - correctly update key layouts"Timur Pocheptsov2016-10-101-9/+7
| * | macOS: Get rid of m_qtView member in QCocoaWindow that aliased m_viewTor Arne Vestbø2016-10-109-49/+65
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-062-4/+7
| |\|
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-051-1/+1
| | |\
| | | * QCocoaEventDispatcher: Save interrupt state between embedded callsGabriel de Dietrich2016-10-041-1/+1
| | * | 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-0619-81/+81
| * | | Implement QMacCocoaViewContainer in terms of foreign windowTor Arne Vestbø2016-10-054-33/+2
| * | | macOS: Rename m_contentView to m_view, to distinguish from [NSWindow contentV...Tor Arne Vestbø2016-10-056-75/+76
| * | | Fix PrintScreen mapping on macOS and moreAllan Sandfeld Jensen2016-10-041-1/+5
| * | | Remove QCocoaWindowPointer in favor of QCocoaWindow inheriting QObjectTor Arne Vestbø2016-10-012-54/+19
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-292-11/+9
|\| | |
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-292-11/+9
| |\| |
| | * | Cocoa: Get mouse position from the eventMorten Johan Sørvig2016-09-271-9/+9
| | * | QGuiApplication, platform plugins: don't modify AA_DontUseNativeMenuBarShawn Rutledge2016-09-261-2/+0
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-263-2/+18
|\| | |
| * | | Cocoa: Add drawBackingStoreUsingCoreGraphicsMorten Johan Sørvig2016-09-222-2/+13
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-221-0/+5
| |\| |
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-211-0/+5
| | |\|
| | | * Update swap interval of QCocoaGLContext after creationTor Arne Vestbø2016-09-191-0/+5
* | | | macOS: fix 32-bit buildsJake Petroules2016-09-213-6/+6
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-2118-628/+41
|\| | |
| * | | macOS: Implement QCocoaBackingStore in terms of QRasterBackingStoreTor Arne Vestbø2016-09-183-79/+18
| * | | macOS: Move QColor/QBrush conversion functions to QtGuiTor Arne Vestbø2016-09-182-132/+0
| * | | macOS: Move image conversion functions to QtGuiTor Arne Vestbø2016-09-1811-140/+10
| * | | macOS: Remove unused function qt_mac_QRegionToHIMutableShapeTor Arne Vestbø2016-09-182-13/+0
| * | | macOS: Move QMacCGContext helper into QtGuiTor Arne Vestbø2016-09-177-265/+14
* | | | Replace usages of QSysInfo with QOperatingSystemVersionJake Petroules2016-09-203-3/+4
|/ / /
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-051-1/+9
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-051-1/+9
| |\|
| | * Cocoa: Add support for triple-buffered GL contextsTor Arne Vestbø2016-08-291-1/+9
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-299-54/+67
|\| |
| * | Revert "Cocoa: make dialogs emit the "selected" signals"J-P Nurmi2016-08-183-12/+0
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-186-42/+67
| |\|
| | * QCocoaInputContext: Fix wrong memory releaseGabriel de Dietrich2016-08-181-1/+1
| | * Cocoa QPA Menus: Propagate enabled state downwardsGabriel de Dietrich2016-08-175-41/+66
* | | fix build with various QT_NO_* definesNick Shaforostoff2016-08-268-2/+43
* | | Merge dev into 5.8Oswald Buddenhagen2016-08-227-67/+61
|\ \ \
| * | | Use qtConfig throughout in qtbaseLars Knoll2016-08-191-1/+1
| * | | QCocoaFileIconEngine: Add icon size 256Friedemann Kleint2016-08-171-1/+2
| * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-165-13/+48
| |\| |