summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-183-7/+18
|\
| * Fix crash when Android Style is set more than once.BogDan Vatra2014-12-153-7/+18
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-104-28/+37
|\ \ | |/
| * Added support for CTRL key modifier to Android builds.Przemysław Czerpak2014-12-081-22/+21
| * Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/stagin...Simon Hausmann2014-12-051-1/+2
| |\
| | * Merge remote-tracking branch 'origin/5.4.0' into 5.4Simon Hausmann2014-12-051-1/+2
| | |\
| | | * Android: Fix broken system paletteEskil Abrahamsen Blomfeldt2014-12-031-1/+2
| * | | Fix QOpenGLWidget/QQuickWidget GUI freezePaul Olav Tvete2014-12-051-5/+10
| |/ /
| * | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-271-0/+4
| |\ \ | | |/
| | * Fix for HTC Pinyin input methodPaul Olav Tvete2014-11-241-0/+4
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-274-16/+19
|\ \ \ | |/ /
| * | Android: replace qFind with std::findShawn Rutledge2014-11-262-13/+13
| * | [QAndroidPlatformTheme] Get rid of static QFontKonstantin Ritt2014-11-252-3/+6
| |/
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-2411-139/+350
|\ \ | |/
| * Set Android palette and fonts in QPA plugin.BogDan Vatra2014-11-144-23/+318
| * Android: Remove AttachedJNIEnv class.Christian Strømme2014-11-032-48/+4
| * Android: Simplify the jni code in QtAndroidMenuChristian Strømme2014-11-033-24/+8
| * Android: Simplify the jni code in QtAndroidInputChristian Strømme2014-11-031-42/+17
| * QAndroidPlatformClipboard: fix build in release modeJ-P Nurmi2014-11-011-2/+3
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-209-22/+169
|\ \ | |/
| * Android: deadlock avoidancePaul Olav Tvete2014-10-206-1/+125
| * Delay showing keyboard until application is activePaul Olav Tvete2014-10-202-0/+15
| * Consolidate how contentDescription is calculated.Jan Arve Saether2014-10-151-10/+18
| * Android: Make memory handling in QClipboard consistent with iOSEskil Abrahamsen Blomfeldt2014-10-101-1/+2
| * Android: Return empty mime data instead of 0 from empty clipboardEskil Abrahamsen Blomfeldt2014-10-101-4/+4
| * Android: Fix memory leak in QClipboard::setMimeData()Eskil Abrahamsen Blomfeldt2014-10-101-0/+1
| * Android: Support QClipboard::clear()Eskil Abrahamsen Blomfeldt2014-10-101-4/+2
| * Android: Thread fix/optimizationPaul Olav Tvete2014-10-101-3/+3
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-099-46/+126
|\ \ | |/
| * Don't use QStringLiteral in comparisonsMarc Mutz2014-10-091-3/+3
| * Android: Hide vkb when IM disabled for focus objectEskil Abrahamsen Blomfeldt2014-10-031-4/+8
| * Android: Don't include Apache code under LGPLv2 licenseEskil Abrahamsen Blomfeldt2014-10-023-14/+66
| * Use PopupMenu when possible.BogDan Vatra2014-10-014-25/+49
* | Merge remote-tracking branch 'origin/5.4' into devOswald Buddenhagen2014-09-2953-1118/+808
|\ \ | |/
| * Android: Add function to change the stacking order in the layout.Christian Strømme2014-09-264-0/+44
| * Android: Add findClass() function to the QJNIEnvironmentPrivate class.Christian Strømme2014-09-264-28/+19
| * Android: Improve the foreign-window implementationChristian Strømme2014-09-264-29/+93
| * Update license headers and add new license filesMatti Paaso2014-09-2453-972/+548
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-235-23/+33
| |\
| | * Merge remote-tracking branch 'origin/5.3.2' into 5.3Frederik Gladhorn2014-09-171-10/+16
| | |\
| | | * Android: use FBO readback workaround by default.Yoann Lopes2014-09-031-10/+16
| | * | Android: Avoid deadlock in Qt.inputMethod.visiblePaul Olav Tvete2014-09-021-12/+4
| | |/
| | * Android: Fix crash at shutdown when keyboard is visibleSérgio Martins2014-08-281-1/+2
| | * Android: added more devices to the FBO readback workaround check.Yoann Lopes2014-08-272-4/+9
| | * Android quickfix: Avoid crash at shutdownPaul Olav Tvete2014-08-271-1/+3
| | * Resize correctly on orientation change.Paul Olav Tvete2014-08-202-2/+2
| | * Use correct size in fullscreen modePaul Olav Tvete2014-08-201-0/+6
| * | Respect the PM_SmallIconSize setting for icons in a menu on OS XAndy Shaw2014-09-202-0/+7
| * | Android: fix inputmethod race conditionsPaul Olav Tvete2014-09-102-63/+62
| * | qpa: Make screen geometry updates (full and available geometry) atomicTor Arne Vestbø2014-09-101-3/+2