Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-04-06 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Fix crash for multiscript text in QTextEngine::boundingBox() | Eskil Abrahamsen Blomfeldt | 2010-04-06 | 1 | -1/+1 | |
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-04-06 | 3 | -12/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Fixed modal dialog not to have automatic "Exit" right softkey in S60. | Janne Anttila | 2010-04-06 | 3 | -12/+5 | |
| | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-06 | 4 | -38/+24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | / / / / / / / | | | | |_|/ / / / / / / | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Toby Tomkins | 2010-04-06 | 2 | -2/+1 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Remove qWait functions as it is used in QTRY_* macros. | Toby Tomkins | 2010-04-06 | 1 | -23/+13 | |
| | | | | | | * | | | | | | Mismatch between reported and actual supported sample rates in | Kurt Korbatits | 2010-04-07 | 1 | -11/+63 | |
| | | | | |_|/ / / / / / | | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6 | Kurt Korbatits | 2010-04-06 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | Did not include updated repaint number for parent item in revert. | Toby Tomkins | 2010-04-06 | 1 | -1/+1 | |
| | | | * | | | | | | | | QAudioInput: possible change of state without emitting stateChange() | Kurt Korbatits | 2010-04-06 | 2 | -2/+1 | |
| | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-05 | 1 | -14/+11 | |
| | | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-03 | 1 | -14/+11 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-01 | 1 | -14/+11 | |
| | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | Partially revert "Remove qWait functions as it is used in QTRY_* macros." | Toby Tomkins | 2010-04-01 | 1 | -172/+314 | |
| | | | | * | | | | | | | | Merge commit 'origin/4.6' into 4.6-multimedia | Toby Tomkins | 2010-04-01 | 100 | -821/+1581 | |
| | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Toby Tomkins | 2010-04-01 | 9 | -3/+365 | |
| | | | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | Remove qWait functions as it is used in QTRY_* macros. | Toby Tomkins | 2010-04-01 | 1 | -327/+182 | |
| | * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-04-05 | 2 | -0/+32 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Implementing QFontEngineS60::getSfntTableData() | Alessandro Portale | 2010-04-05 | 2 | -0/+32 | |
| | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-04-03 | 2 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | / / / / / / | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | Fix doc for deprecated QGridLayout::colSpacing: point to existing method | David Faure | 2010-04-03 | 1 | -1/+1 | |
| | | * | | | | | | | | | | qDebug() << myPointF would remove spaces in following arguments. | David Faure | 2010-04-03 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-04-01 | 1 | -2/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Fix crash in the fileiconprovider for Windows | Jens Bache-Wiig | 2010-04-01 | 1 | -2/+4 | |
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-03-31 | 3 | -6/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Ensure Phonon MMF backend emits aboutToFinish | Gareth Stockwell | 2010-03-31 | 2 | -5/+10 | |
| | | * | | | | | | | | | Remove compiler warning | Gareth Stockwell | 2010-03-31 | 1 | -1/+1 | |
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-03-31 | 4 | -3/+20 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetwork | Tasuku Suzuki | 2010-03-31 | 2 | -1/+6 | |
| | | * | | | | | | | | | Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style. | David Faure | 2010-03-31 | 2 | -2/+14 | |
| | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-03-31 | 1 | -6/+13 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Rhys Weatherley | 2010-03-31 | 10 | -294/+8 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Allow attributes to be bound after a QGLShaderProgram is linked. | Rhys Weatherley | 2010-03-31 | 1 | -6/+13 | |
| | * | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-03-31 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | Fix translation mistake spotted by Laurent Montel | David Faure | 2010-03-31 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Update src/3rdparty/webkit from trunk. | Jocelyn Turcotte | 2010-04-12 | 64 | -1038/+1800 | |
* | | | | | | | | | | | | | Fix failing assertions in debug builds | Simon Hausmann | 2010-04-09 | 3 | -5/+2 | |
* | | | | | | | | | | | | | Fix the build of webkit examples on platforms without OpenGL and Multimedia | Simon Hausmann | 2010-04-08 | 1 | -2/+2 | |
* | | | | | | | | | | | | | QtWebKit: Fix build on mac. | Jocelyn Turcotte | 2010-04-08 | 2 | -8/+14 | |
* | | | | | | | | | | | | | QtWebKit: Build fix for WinCE. | Jocelyn Turcotte | 2010-04-07 | 1 | -2/+2 | |
* | | | | | | | | | | | | | QtWebKit: Fix build on WinCE, adding missing include path. | Jocelyn Turcotte | 2010-04-07 | 2 | -9/+3 | |
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration | Qt Continuous Integration System | 2010-04-07 | 3625 | -151393/+317270 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | QtWebKit: Change the dependency from phonon to QtMultimedia. | Jocelyn Turcotte | 2010-04-07 | 1 | -2/+2 | |
| * | | | | | | | | | | | | QtWebKit: Add missing namespace wrapper temporarily until next import. | Jocelyn Turcotte | 2010-04-06 | 6 | -0/+13 | |
| * | | | | | | | | | | | | QtWebKit: fix build with qws temporarily until next import. | Jocelyn Turcotte | 2010-04-06 | 2 | -8/+4 | |
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into testMerge | Jocelyn Turcotte | 2010-04-06 | 8 | -2/+490 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Update src/3rdparty/webkit from trunk. | Jocelyn Turcotte | 2010-04-06 | 3624 | -151389/+317257 | |
| * | | | | | | | | | | | | QtWebKit: Re-add the dependency to the static linked JavaScriptCore | Jocelyn Turcotte | 2010-04-06 | 1 | -2/+2 | |
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-06 | 5 | -15/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |