summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-2823-127/+391
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-263-13/+33
| |\
| | * 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-252-2/+16
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-266-70/+281
| |\ \
| | * | 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-252-0/+119
| | * | 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-252-7/+9
| |\ \ \ | | |_|/ | |/| |
| | * | QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-252-7/+9
| * | | 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/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-231-8/+29
| |\ \ \ \ \ | | |/ / / /
| | * | | | DelayRemove of list delegate on section boundary duplicated sectionMartin Jones2011-02-231-8/+29
| * | | | | 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-221-0/+7
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Prevent infinite loop in raster engine on zero dash pattern length.Samuel Rødal2011-02-221-0/+7
| * | | | | 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 commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-23125-719/+1416
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | * | | | Fix crash in KPackageKitGabriel de Dietrich2011-02-151-5/+6
| | * | | | Merge branch '4.7-upstream' into 4.7Gabriel de Dietrich2011-02-1558-292/+597
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7Gabriel de Dietrich2011-02-08215-1770/+7680
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2011-02-0151-287/+1019
| | |\ \ \ \ \ \
| | * | | | | | | Plug memory leak when using qt_mac_set_dock_menu() on CocoaAndy Shaw2011-01-261-0/+1
| * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-22121-751/+953
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-211-0/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Wheel delta is always zero in QEventTransition's eventDean Dettman2011-02-211-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-2017-75/+108
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fix warning about id maybe used when uninitialisedThiago Macieira2011-02-201-1/+1
| | | * | | | | | | Doc: setSslConfiguration also sets the CA certificatesThiago Macieira2011-02-201-2/+3
| | | * | | | | | | Prevents crashing when ICO file has bad color table valueMauri Vehniäinen2011-02-181-0/+2