summaryrefslogtreecommitdiffstats
path: root/src/plugins/graphicssystems
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-1125-25/+25
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-201-1/+3
|\
| * Prevent failed rendering for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+3
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-061-0/+8
|\ \ | |/
| * Fixes switching runtime graphics system when the maximized window is shown or...Stanislav Ionascu2011-07-051-0/+8
* | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-1725-433/+433
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-1725-431/+431
| |\
| | * Update licenseheader text in source filesJyri Tahtela2011-05-1325-431/+431
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-161-2/+2
| |\ \
| | * | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
| | |/
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-112-2/+18
|\ \ \ | |/ /
| * | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-102-2/+18
| |/
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-032-2/+12
|\ \
| * \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-2/+12
| |\ \ | | |/
| | * Fixed not switching to MeeGo graphicssystem.Samuel Rødal2011-03-301-1/+1
| | * QMeeGoLivePixmapData: Verify dimensions of locked pixmapSami Kyostila2011-03-281-1/+11
* | | Check that pixmap is not null before accessing itPauli Nieminen2011-04-011-1/+1
|/ /
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-192-6/+19
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-182-6/+19
| |\
| | * Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-182-6/+19
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-181-1/+38
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-171-1/+38
| |\ \ | | |/
| | * Switch to raster also when last window is destroyed (on MeeGo).Samuel Rødal2011-03-171-1/+38
* | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-163-15/+175
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-163-15/+175
| |\ \ | | |/
| | * QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.Tapani Pälli2011-03-161-1/+1
| | * Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-162-14/+174
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-5/+7
|\ \ \ | |/ /
| * | Don't use EGL surfaces for translucency with 32MB GPU chip.Jani Hautakangas2011-03-101-5/+7
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-084-0/+34
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-074-0/+34
| |\ \ | | |/
| | * Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-074-0/+34
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-041-1/+1
| |\ \ | | |/
| | * Added image conversion flag to prevent conversions.Samuel Rødal2011-03-041-1/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-032-0/+8
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-012-96/+59
| |\ \ | | |/
| * | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-012-0/+8
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-95/+52
|\ \ \ | | |/ | |/|
| * | RGBA32 -> RGB565 dithering in Meego Graphicssystem,Tero Tiittanen2011-02-171-95/+52
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-031-1/+7
|\ \ \ | |/ /
| * | Prevent recursion when creating window surface.Samuel Rødal2011-02-021-1/+7
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1725-25/+27
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-1025-25/+25
| |\
| | * Update copyright year to 2011.Jason McDonald2011-01-1025-25/+25
| * | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-101-0/+2
| |/
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-051-6/+2
|\ \ | |/
| * Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-132-5/+15
|\ \ | |/
| * Use a different dither distribution matrix + a bit of rand.Michael Dominic K2010-12-081-4/+7