summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix a memory leak of EGLSurface's in QGLContextRhys Weatherley2009-09-301-2/+4
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-09-305-153/+64
|\
| * Convert OpenGL convolution filter to OpenGL2 paint engineRhys Weatherley2009-09-301-120/+59
| * Make QPF's implementation of alphaMapForGlyph() consistent.Rhys Weatherley2009-09-294-33/+5
* | (ODBC) Better fix for readonly result setBill King2009-09-302-5/+13
|/
* Changed internal tr()'s to be QString::fromLatin1() in alsa builtin.Kurt Korbatits2009-09-292-22/+22
* QString(" => QString::fromLatin1("Anders Bakken2009-09-291-1/+1
* Adds QUrl::fromUserInput, gathered from QWebView::guessUrlFromString.Jocelyn Turcotte2009-09-292-0/+77
* Used the correct placeholder for the second argumentJure Repinc2009-09-291-1/+1
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-293-2/+23
|\
| * Make sure delayed events are cancelled when a state machine haltsKent Hansen2009-09-292-0/+21
| * Remove "inline" keyword from unused constructorsHarald Fernengel2009-09-291-2/+2
* | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-2928-156/+247
|\ \ | |/
| * Fix tr-Errors/remove QObject::tr(), mainly in ScriptToolsFriedemann Kleint2009-09-2910-60/+63
| * Introduce state machine event priority, make it possible to cancel eventsKent Hansen2009-09-292-20/+89
| * Fix bug with posting events from HandleCommandL on Symbian.Jason Barron2009-09-291-0/+1
| * Merge branch '4.5' into 4.6Thiago Macieira2009-09-291-7/+4
| |\
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-291-16/+10
| | |\
| | | * QGraphicsItem: cached embedded widget item is not repainted when widget is up...Andreas Aardal Hanssen2009-09-291-16/+10
| | * | Remove mentions of QtSW.Jason McDonald2009-09-292-3/+3
| | |/
| * | make sure QtWebKit and QtScript are included in the .sis fileEspen Riskedal2009-09-291-0/+5
| * | Fix EGL/GLX surface leak when using texture-from-pixmapTom Cooksey2009-09-291-3/+2
| * | Fix typo.Alexis Menard2009-09-291-2/+2
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jeremy Katz2009-09-29164-1145/+3703
| |\ \
| | * | After some discussion we decided to remove hasConflicts() from the API.Jan-Arve Sæther2009-09-294-14/+13
| | * | Add missing docs for QGraphicsAnchorJan-Arve Sæther2009-09-291-0/+18
| * | | fix warnings about declarations shadowing class members (autotest reported)Jeremy Katz2009-09-297-50/+50
* | | | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-29295-2630/+5472
|\ \ \ \ | | |/ / | |/| |
| * | | Re-apply change e20c832098d98076a0f988ce01b53586e370d272 by Simon HausmannSimon Hausmann2009-09-291-5/+0
| * | | Re-apply change e433f472a765d738238a6b380060ce15c4910148 by Jedrzej NowackiJedrzej Nowacki2009-09-291-3/+7
| * | | Updated WebKit from /home/joce/dev/qtwebkit/ to qtwebkit-4.6-snapshot-2909200...Jocelyn Turcotte2009-09-29152-1116/+3595
| * | | Minor fixes in webkit's documentationPierre Rossi2009-09-291-4/+4
| * | | Do synchronous processing of events in state machine if possibleKent Hansen2009-09-292-13/+40
| * | | doc: Describe the semantics of targetless state machine transitionsKent Hansen2009-09-291-0/+4
| * | | QScript: fix the way the js stack is advanced.Olivier Goffart2009-09-292-4/+10
| * | | Add the -testability option to Qt applications.Petri Kiiskinen2009-09-293-1/+27
| |/ /
| * | HTTP backend: store the date header in the cached resourcePeter Hartmann2009-09-291-5/+8
| * | Mac: Fix build failure on tigerRichard Moe Gustavsen2009-09-291-0/+11
| * | Update docs for softkeys to match new API and implementation.Jason Barron2009-09-291-16/+18
| * | Fix a bug in QPixmapCache when the cache is trimmed by QCache.Alexis Menard2009-09-295-36/+42
| * | Use glXGetProcAddress to resolve glx extensionsTom Cooksey2009-09-292-57/+68
| * | I18N: Add new module, fix spelling glitch.Friedemann Kleint2009-09-291-1/+1
| * | Revert the new QFSEventsFileSystemWatcherEngine on Mac for now.Alexis Menard2009-09-291-1/+1
| * | Add a more proper shutdown sequence for Symbian applications.Jason Barron2009-09-291-3/+9
| * | Fix some docs to follow the Qt style. (remove asterisks, proper indenting)Jan-Arve Sæther2009-09-291-44/+44
| * | Dont generate public docs for QSimplex.Jan-Arve Sæther2009-09-291-0/+4
| * | Fix qdoc error.Jason McDonald2009-09-291-2/+2
| * | Fix a alpha issue with RGB32 and DirectFBAnders Bakken2009-09-291-1/+4
| * | doc: add some more \since 4.6 tagsVolker Hilsheimer2009-09-2810-9/+58
| * | QWheelEvent not working on Cocoa 64BitPrasanth Ullattil2009-09-281-3/+3