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-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 | |
* | | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | 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 | |
| |\ \ \ \ \ \ \ |/ / / / / / / / | ||||||
| * | | | | | | | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set | Gabriel de Dietrich | 2010-04-06 | 1 | -1/+2 | |
| * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-04-06 | 318 | -5597/+6800 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Prevented unnecessary copy in QImage::setAlphaChannel(). | Samuel Rødal | 2010-04-06 | 1 | -3/+4 | |
| | * | | | | | | | 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 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | 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 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | Change the ifdef for resolving function ptrs to match declaration | Tom Cooksey | 2010-04-06 | 1 | -1/+1 | |
| * | | | | | | | | | | Fix painting artifacts on text | Eskil Abrahamsen Blomfeldt | 2010-04-06 | 2 | -10/+7 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-06 | 6 | -3/+31 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Doc: update the QDBusPendingCallWatcher example to show where to delete | Thiago Macieira | 2010-04-06 | 1 | -0/+1 | |
| * | | | | | | | | | Doc: Remove QDBusServer from the public documentation. | Thiago Macieira | 2010-04-06 | 1 | -1/+1 | |
| * | | | | | | | | | [Cocoa] QDialogs with WindowStayOnStopHint parent | Carlos Manuel Duclos Vergara | 2010-04-06 | 1 | -1/+8 | |
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-06 | 3 | -1/+21 | |
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / / | ||||||
| * | | | | | | | | | Fix a coding style issue of the GTK style | Benjamin Poulain | 2010-04-06 | 1 | -1/+1 | |
| * | | | | | | | | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors | Johan Hauan | 2010-04-06 | 2 | -1/+6 | |
| * | | | | | | | | | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++ | Zeno Albisser | 2010-04-06 | 1 | -0/+15 | |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-06 | 8 | -2/+490 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-06 | 244 | -4153/+4402 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-06 | 8 | -2/+491 | |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-06 | 4 | -8/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Empty commit to trigger rebuilding in the CI system. | Thiago Macieira | 2010-04-05 | 0 | -0/+0 | |
| * | | | | | | | | | | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-04-05 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-04 | 1 | -18/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-04 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Make it possible to build QtDBus and its tools on Windows CE. | Thiago Macieira | 2010-04-05 | 3 | -7/+3 | |
| | | * | | | | | | | | | | Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixed | Thiago Macieira | 2010-04-04 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Revert "Attempt at fixing Phonon build issue on Symbian." | Thiago Macieira | 2010-04-04 | 1 | -18/+20 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Attempt at fixing Phonon build issue on Symbian. | Thiago Macieira | 2010-04-04 | 1 | -3/+5 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-03 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [plugins] Don't conclude that a .debug file is a plugin. | Thiago Macieira | 2010-04-03 | 1 | -0/+14 | |
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-02 | 23 | -3525/+3724 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-02 | 23 | -3525/+3724 | |
| |\ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Revert "Make s60main static lib not depend on QtCore" | Iain | 2010-04-02 | 2 | -48/+5 | |
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-01 | 24 | -3530/+3772 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-04-01 | 84 | -1437/+1903 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-01 | 24 | -3531/+3772 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-01 | 24 | -3531/+3772 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-31 | 24 | -3531/+3772 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | Fix regression on Symbian | Shane Kearns | 2010-03-31 | 1 | -1/+1 | |
| | | | | * | | | | | | | | | | | Fix broken test case | Shane Kearns | 2010-03-31 | 1 | -0/+7 | |
| | | | | * | | | | | | | | | | | Cleanup the deployment code | Thomas Zander | 2010-03-31 | 5 | -10/+8 | |
| | | | | * | | | | | | | | | | | Fix 'make sis' finding the dll on symbian | Thomas Zander | 2010-03-31 | 4 | -4/+4 | |
| | | | | * | | | | | | | | | | | Merge commit 'origin/4.7' into symbian47 | Thomas Zander | 2010-03-31 | 210 | -2558/+5930 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | Re-add line that was lost during webkit update. | Thomas Zander | 2010-03-30 | 1 | -0/+1 | |