summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-061-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix crash for multiscript text in QTextEngine::boundingBox()Eskil Abrahamsen Blomfeldt2010-04-061-1/+1
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-063-12/+5
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed modal dialog not to have automatic "Exit" right softkey in S60.Janne Anttila2010-04-063-12/+5
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-064-38/+24
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | / / / / / / / | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Toby Tomkins2010-04-062-2/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-061-23/+13
| | | | | | | * | | | | | Mismatch between reported and actual supported sample rates inKurt Korbatits2010-04-071-11/+63
| | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-061-1/+1
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Did not include updated repaint number for parent item in revert.Toby Tomkins2010-04-061-1/+1
| | | | * | | | | | | | QAudioInput: possible change of state without emitting stateChange()Kurt Korbatits2010-04-062-2/+1
| | | |/ / / / / / / /
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-051-14/+11
| | | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-031-14/+11
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-011-14/+11
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Partially revert "Remove qWait functions as it is used in QTRY_* macros."Toby Tomkins2010-04-011-172/+314
| | | | | * | | | | | | | Merge commit 'origin/4.6' into 4.6-multimediaToby Tomkins2010-04-01100-821/+1581
| | | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Toby Tomkins2010-04-019-3/+365
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-011-327/+182
| | * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-052-0/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Implementing QFontEngineS60::getSfntTableData()Alessandro Portale2010-04-052-0/+32
| | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-032-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | / / / / / / | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Fix doc for deprecated QGridLayout::colSpacing: point to existing methodDavid Faure2010-04-031-1/+1
| | | * | | | | | | | | | qDebug() << myPointF would remove spaces in following arguments.David Faure2010-04-031-1/+1
| | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-011-2/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fix crash in the fileiconprovider for WindowsJens Bache-Wiig2010-04-011-2/+4
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-313-6/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Ensure Phonon MMF backend emits aboutToFinishGareth Stockwell2010-03-312-5/+10
| | | * | | | | | | | | Remove compiler warningGareth Stockwell2010-03-311-1/+1
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-314-3/+20
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetworkTasuku Suzuki2010-03-312-1/+6
| | | * | | | | | | | | Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.David Faure2010-03-312-2/+14
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-311-6/+13
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Rhys Weatherley2010-03-3110-294/+8
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Allow attributes to be bound after a QGLShaderProgram is linked.Rhys Weatherley2010-03-311-6/+13
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-311-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Fix translation mistake spotted by Laurent MontelDavid Faure2010-03-311-1/+1
* | | | | | | | | | | | | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-1264-1038/+1800
* | | | | | | | | | | | | Fix failing assertions in debug buildsSimon Hausmann2010-04-093-5/+2
* | | | | | | | | | | | | Fix the build of webkit examples on platforms without OpenGL and MultimediaSimon Hausmann2010-04-081-2/+2
* | | | | | | | | | | | | QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-082-8/+14
* | | | | | | | | | | | | QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-071-2/+2
* | | | | | | | | | | | | QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-072-9/+3
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-073625-151393/+317270
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | QtWebKit: Change the dependency from phonon to QtMultimedia.Jocelyn Turcotte2010-04-071-2/+2
| * | | | | | | | | | | | QtWebKit: Add missing namespace wrapper temporarily until next import.Jocelyn Turcotte2010-04-066-0/+13
| * | | | | | | | | | | | QtWebKit: fix build with qws temporarily until next import.Jocelyn Turcotte2010-04-062-8/+4
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into testMergeJocelyn Turcotte2010-04-068-2/+490
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-063624-151389/+317257
| * | | | | | | | | | | | QtWebKit: Re-add the dependency to the static linked JavaScriptCoreJocelyn Turcotte2010-04-061-2/+2
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-065-15/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |