Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-12-21 | 3 | -6/+15 |
|\ | |||||
| * | Delay creation of the process manager | Harald Fernengel | 2010-12-20 | 3 | -6/+15 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 2 | -9/+44 |
|\ \ | |/ |/| | |||||
| * | Add a warning about trying to release a timer ID that isn't active | Thiago Macieira | 2010-12-15 | 1 | -0/+1 |
| * | Add a small protection against releasing a timer twice. | Thiago Macieira | 2010-12-13 | 1 | -2/+12 |
| * | Use constants the timer ID masks instead of values everywhere | Thiago Macieira | 2010-12-13 | 1 | -4/+8 |
| * | Fix ABA problem with: the serial must be updated on all accesses | Thiago Macieira | 2010-12-13 | 1 | -1/+1 |
| * | Comment a bit more the timer ID allocation code. | Thiago Macieira | 2010-12-13 | 1 | -2/+22 |
* | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil... | Qt Continuous Integration System | 2010-12-14 | 4 | -58/+394 |
|\ \ | |||||
| * \ | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil... | Qt Continuous Integration System | 2010-12-07 | 4 | -58/+394 |
| |\ \ | |||||
| | * | | Fix compile error | Shane Kearns | 2010-12-03 | 1 | -0/+2 |
| | * | | Merge remote branch 'origin/master' into file-engine-refactor | João Abecasis | 2010-12-02 | 3 | -18/+42 |
| | |\ \ | |||||
| | * \ \ | Merge remote branch 'qt/master' into file-engine-refactor | João Abecasis | 2010-11-23 | 19 | -56/+88 |
| | |\ \ \ | |||||
| | * | | | | Use QSystemError to return errors from QFileSystemEngine | Shane Kearns | 2010-10-12 | 1 | -6/+34 |
| | * | | | | Create QSystemError class | Shane Kearns | 2010-10-08 | 3 | -58/+357 |
| | * | | | | Merge commit 'origin/master' into fileEngines | Thomas Zander | 2010-10-06 | 2 | -15/+31 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge commit 'origin/master' into fileEnginesOn47 | Thomas Zander | 2010-09-28 | 14 | -58/+287 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Move rootPath, homePath, tempPath, currentPath and setCurrentPath | Shane Kearns | 2010-09-20 | 1 | -0/+7 |
* | | | | | | | | QPointer: thread safety | Olivier Goffart | 2010-12-13 | 1 | -0/+2 |
|/ / / / / / / | |||||
* | | | | | | | QScroller merge, part 1 | Robert Griebl | 2010-12-02 | 2 | -0/+5 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | avoid the warning about comparison between signed and unsigned integers | Konstantin Ritt | 2010-11-30 | 1 | -1/+1 |
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 2 | -16/+36 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Prevent compilers optimizing eval timebomb code out of existence. | Jason McDonald | 2010-11-24 | 1 | -2/+2 |
| * | | | | | Compile when USER_TIMER_MINIMUM isn't defined | Bradley T. Hughes | 2010-11-22 | 1 | -1/+1 |
| * | | | | | Don't let posted events starve native dialogs (regression) | Bradley T. Hughes | 2010-11-18 | 1 | -14/+34 |
| * | | | | | Push and pop the thread-default context for the current thread | Philip Van Hoof | 2010-11-11 | 1 | -0/+7 |
* | | | | | | Do not define METHOD if QT_NO_KEYWORD is defined. | Olivier Goffart | 2010-11-22 | 1 | -2/+6 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 3 | -9/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-09 | 2 | -4/+9 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'QT-4077-fix' into 4.7-s60 | axis | 2010-11-05 | 2 | -4/+9 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed event starvation with pointer events on Symbian. | axis | 2010-11-05 | 2 | -4/+9 |
| * | | | | | | Doc: Removed note about some Qt classes working without an application. | David Boddie | 2010-11-04 | 1 | -5/+4 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-03 | 2 | -3/+8 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-03 | 2 | -3/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Push and pop the thread-default context for the current thread | Philip Van Hoof | 2010-11-01 | 1 | -0/+7 |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-29 | 1 | -3/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Simplify object lifetime management when moving objects to a QThread | Bradley T. Hughes | 2010-10-29 | 1 | -3/+1 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-11-03 | 2 | -0/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add member-swap to shared datatypes that don't have it. | Marc Mutz | 2010-11-03 | 2 | -0/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Fix a few typos in comments and docs. | Jason McDonald | 2010-11-01 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2010-10-29 | 5 | -7/+24 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 5 | -36/+23 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 2 | -0/+7 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Lighthouse on OS X. | Morten Johan Sørvig | 2010-10-20 | 1 | -0/+8 |
| | * | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-10-05 | 8 | -131/+214 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-09-13 | 5 | -26/+78 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 5 | -24/+25 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 2 | -15/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |