Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-18 | 1 | -0/+2 |
|\ | |||||
| * | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-17 | 1 | -0/+2 |
| |\ | |||||
| | * | Fix QT_NO_SHAREDMEMORY while not breaking the QNX build | Jørgen Lind | 2009-11-16 | 1 | -0/+2 |
* | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-17 | 11 | -58/+86 |
|\ \ \ | |/ / | |||||
| * | | Small doc fix. | axis | 2009-11-17 | 1 | -1/+1 |
| * | | Merge remote branch 'staging/4.6' into 4.6 | Simon Hausmann | 2009-11-17 | 9 | -53/+83 |
| |\ \ | | |/ | |/| | |||||
| | * | doc: Fixed qdoc errors. | Martin Smith | 2009-11-16 | 1 | -1/+1 |
| | * | doc: Fixed qdoc according to Bjarne's recommendation. | Martin Smith | 2009-11-16 | 1 | -3/+28 |
| | * | Don't sendPostedEvents() twice when calling processEvents() manually | Bradley T. Hughes | 2009-11-16 | 1 | -6/+6 |
| | * | Fix compilation on solaris-g++-64. | Thiago Macieira | 2009-11-13 | 1 | -0/+1 |
| | * | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-13 | 2 | -9/+9 |
| | |\ | |||||
| | * | | doc: Fixed qdoc according to Bjarne's recommendation. | Martin Smith | 2009-11-13 | 1 | -6/+8 |
| | * | | Merge commit 'coreteam/4.6' into oslo1-4.6 | Marius Storm-Olsen | 2009-11-13 | 3 | -16/+17 |
| | |\ \ | |||||
| | | * | | utils/qlalr generator: adapt changes to xmlstream and script files | Peter Hartmann | 2009-11-11 | 3 | -16/+17 |
| | * | | | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-12 | 1 | -0/+20 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.6' into osloStaging1-4.6 | Jocelyn Turcotte | 2009-11-12 | 1 | -21/+22 |
| | |\ \ \ \ | |||||
| | | * | | | | QUrl::fromUserInput: improvements, corrections and make the demo | Jocelyn Turcotte | 2009-11-12 | 1 | -21/+22 |
| * | | | | | | Early return for allowMove within a parent QModelIndex | Stephen Kelly | 2009-11-13 | 1 | -4/+2 |
| * | | | | | | Merge commit upstream/4.6 into oslo-staging-2/4.6 | Olivier Goffart | 2009-11-13 | 3 | -1/+26 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st... | axis | 2009-11-12 | 6 | -114/+861 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6 | Shane Kearns | 2009-11-11 | 6 | -60/+29 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Revert "Using qreal more consistently in code (prevent misuse of double)" | Aleksandar Sasha Babic | 2009-11-11 | 6 | -60/+29 |
| | * | | | | | | | Merge commit 'origin/4.6' into 4.6 | Shane Kearns | 2009-11-11 | 2 | -3/+15 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Shane Kearns | 2009-11-10 | 4 | -65/+134 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Shane Kearns | 2009-11-10 | 5 | -135/+108 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60 | axis | 2009-11-09 | 32 | -247/+360 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Using qreal more consistently in code (prevent misuse of double) | Aleksandar Sasha Babic | 2009-11-06 | 6 | -29/+60 |
| | * | | | | | | | | | | Fix functions that return whether atomics are natives following review comments | Shane Kearns | 2009-11-06 | 2 | -18/+76 |
| | * | | | | | | | | | | Binary compatibility of Symbian ARMv5 and ARMv6 builds | Shane Kearns | 2009-11-06 | 6 | -34/+582 |
| | * | | | | | | | | | | Add the ARMv6 inline assembly code for compiling with RVCT. | Thiago Macieira | 2009-11-06 | 1 | -0/+132 |
| | * | | | | | | | | | | Reorganize the qatomic_armv6.h file to receive the RVCT inline | Thiago Macieira | 2009-11-06 | 1 | -81/+90 |
* | | | | | | | | | | | | Fix detection of linux-g++ | Harald Fernengel | 2009-11-17 | 1 | -1/+1 |
* | | | | | | | | | | | | do not (fail to) compile qdatastream into qmake and cetest | Oswald Buddenhagen | 2009-11-13 | 4 | -4/+4 |
* | | | | | | | | | | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-13 | 12 | -127/+911 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix functions that return whether atomics are natives following review comments | Shane Kearns | 2009-11-13 | 2 | -18/+76 |
| * | | | | | | | | | | | | Binary compatibility of Symbian ARMv5 and ARMv6 builds | Shane Kearns | 2009-11-13 | 6 | -34/+582 |
| * | | | | | | | | | | | | Add the ARMv6 inline assembly code for compiling with RVCT. | Thiago Macieira | 2009-11-13 | 1 | -0/+132 |
| * | | | | | | | | | | | | Reorganize the qatomic_armv6.h file to receive the RVCT inline | Thiago Macieira | 2009-11-13 | 1 | -81/+90 |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-13 | 2 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge commit 'widget/4.6' into oslo-staging-2/4.6 | Olivier Goffart | 2009-11-11 | 2 | -9/+9 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Fix docs for animation api | Leonardo Sobral Cunha | 2009-11-09 | 2 | -9/+9 |
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| * | | | | | | | | | | Merge commit 'c785d92153d23b836451b0643424b9871bcc4be9' into 4.6-upstream | Bradley T. Hughes | 2009-11-13 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-12 | 6 | -66/+139 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | * | | | | | | | | Make sure posted events are always sent when calling processEvents() on Win32 | Bradley T. Hughes | 2009-11-11 | 1 | -0/+5 |
| * | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6 | David Boddie | 2009-11-12 | 1 | -0/+20 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | make qfunctions_wince.h C compatible again | Joerg Bornemann | 2009-11-11 | 1 | -0/+4 |
| | * | | | | | | | | Move QCustomScopedPointer to a private header | Harald Fernengel | 2009-11-11 | 4 | -65/+154 |
| | * | | | | | | | | compile fix for tst_qfile on Windows CE | Joerg Bornemann | 2009-11-11 | 1 | -1/+1 |
| | * | | | | | | | | Add error handling for SetTimer() with the sentinel timer id | Bradley T. Hughes | 2009-11-11 | 1 | -3/+11 |
| | * | | | | | | | | Make QScopedPointer::operator== and != non-member | João Abecasis | 2009-11-11 | 1 | -40/+12 |
| | | |_|/ / / / / | | |/| | | | | | |