summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-283-8/+24
|\
| * Fix Mac synthesized italic fonts clipping issue for QGLWidgetJiang Jiang2011-02-281-5/+10
| * Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-02-282-3/+14
| |\
| | * Fix cursor position adjustment when removing stringsJiang Jiang2011-01-252-1/+31
| | * Fix out of bounds handling in Mac shaperJiang Jiang2011-01-142-3/+14
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-281-1/+1
|\ \ \
| * | | Fix openvg compilation on win32.Laszlo Agocs2011-02-281-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-264-13/+44
|\ \ \ \
| * | | | Make QtScript support COLLECT_ON_EVERY_ALLOCATION defineKent Hansen2011-02-251-11/+12
| * | | | Add missing API shims to QScriptValue constructorsKent Hansen2011-02-251-0/+5
| * | | | Don't crash when marking arguments object of native contextKent Hansen2011-02-253-2/+27
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-267-75/+287
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update QtOpenGL def filesJani Hautakangas2011-02-252-0/+15
| * | | | Fix extern usage in qpixmapdata_gl.cppJani Hautakangas2011-02-251-1/+1
| * | | | Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-251-22/+22
| * | | | Fix code style in qgl_symbian.cppJani Hautakangas2011-02-251-4/+4
| * | | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-253-5/+125
| * | | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-252-34/+83
| * | | | Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-251-13/+41
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-253-7/+66
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-253-7/+66
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-251-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | spelling fixes in extending.qdocDavid Fries2011-02-251-3/+3
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-252-0/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Always prepend drive letter to $$EPOCROOT in Windows Symbian buildsMiikka Heikkinen2011-02-241-0/+5
| * | | Add files deployed using qmake_emulator_deployment.flm to 'what' listMiikka Heikkinen2011-02-241-0/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-241-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | QRuntimeWindowSystem: Track window size properlySami Kyostila2011-02-241-0/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-241-3/+2
|\ \ \ \
| * | | | Fix QTBUG-17627: build break in mobility bearer applicationsCristiano di Flora2011-02-241-3/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-241-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Add the missing image for doc of QNetworkSession.Xizhi Zhu2011-02-241-0/+0
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-232-7/+12
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTSJani Hautakangas2011-02-232-7/+12
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-231-1/+1
|\ \ \ \ \
| * | | | | Fix QPlainTextEdit corruption/crash with scrollingmae2011-02-231-1/+1
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-233-8/+47
|\ \ \ \ \ \ | |/ / / / /
| * | | | | DelayRemove of list delegate on section boundary duplicated sectionMartin Jones2011-02-233-8/+47
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-231-0/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | add gsm to connectable bearer for networkmanager.Lorn Potter2011-02-231-0/+5
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-234-6/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | ListView and GridView indexAt should use qreal coordinates.Martin Jones2011-02-234-6/+6
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-222-0/+29
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Prevent infinite loop in raster engine on zero dash pattern length.Samuel Rødal2011-02-222-0/+29
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-221-12/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changesetCristiano di Flora2011-02-221-1/+1
| * | | | | Fix QNetworkConfigurationManager crash due to null private pointer.Cristiano di Flora2011-02-221-12/+5
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-02-224-6/+12
|\ \ \ \ \ \
| * | | | | | Cocoa: Sheets looses focus when moving parent windowRichard Moe Gustavsen2011-02-221-0/+4
| * | | | | | Cocoa: fix crash when using a drawer with a focus widgetRichard Moe Gustavsen2011-02-181-1/+1