summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-30111-441/+6860
|\
| * Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4....Kent Hansen2009-09-303-5/+10
| * Fix linking on windows, building qt in namespaceJarek Kobus2009-09-301-1/+3
| * fix string builder for QT_NO_CAST_FROM_ASCII on Windowshjk2009-09-301-2/+13
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-09-308-160/+81
| |\
| | * 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
| | |/
| * | Fixed error in notify() signal and totalTime() in QAudioInput andKurt Korbatits2009-09-308-11/+62
| |/
| * 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
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Removed trace statements from QtGuiGareth Stockwell2009-09-282-252/+9
| * | | | Removed calls to CCoeControl::DrawNow from QWidgetPrivate::setWSGeometryGareth Stockwell2009-09-281-30/+7
| * | | | Fixed logical error in QSymbianControl::DrawGareth Stockwell2009-09-281-4/+4
| * | | | Fixed build errors due to header filename clashes between epoc32/include and ...Gareth Stockwell2009-09-282-13/+6
| * | | | Implemented QWidget::mapFromGlobal, QWidget::mapToGlobal, for case where chil...Gareth Stockwell2009-09-281-5/+8
| * | | | Revert "Revert all GUI changes from the MMF work."Frans Englich2009-09-285-68/+476
| * | | | Revert "Disable code, as we don't have the required code in QtGui."Frans Englich2009-09-281-8/+6
| * | | | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-24865-16612/+34677
| |\ \ \ \
| * | | | | Revert all GUI changes from the MMF work.Frans Englich2009-09-245-476/+68
| * | | | | Disable code, as we don't have the required code in QtGui.Frans Englich2009-09-241-6/+8
| * | | | | Fix build.Frans Englich2009-09-241-4/+2
| * | | | | Fix build.Frans Englich2009-09-241-1/+2
| * | | | | Optimization: only bitblt if blitting is enabled.Frans Englich2009-09-241-26/+29
| * | | | | Remove TODO comment.Frans Englich2009-09-241-2/+0
| * | | | | Do runtime check for SetVolume.Frans Englich2009-09-241-5/+12
| * | | | | Essentially do 's/NULL/0/g', to adhere to Qt coding style.Frans Englich2009-09-249-22/+22