Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-03-24 | 1 | -1/+1 |
|\ | |||||
| * | Fix compilation for winCE | Thierry Bastian | 2010-03-24 | 1 | -1/+2 |
| * | compile fix for mingw (also removes some warnings) | Thierry Bastian | 2010-03-23 | 1 | -2/+1 |
* | | Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot | Bernhard Rosenkraenzer | 2010-03-23 | 3 | -3/+13 |
* | | QFSFileEngine: don't look through NTFS junctions | Ritt Konstantin | 2010-03-23 | 1 | -8/+2 |
* | | _close(fd) closes the associated handle and not the other way around | João Abecasis | 2010-03-23 | 3 | -2/+22 |
* | | Do not use FSEvents-based filesystemwatcher backend on Mac. | Denis Dzyubenko | 2010-03-22 | 1 | -1/+1 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-22 | 2 | -7/+7 |
|\ \ | |/ |/| | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-19 | 2 | -7/+7 |
| |\ | |||||
| | * | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-03-19 | 4 | -9/+13 |
| | |\ | |||||
| | * | | Rename QTimestamp to QElapsedTimer | Thiago Macieira | 2010-03-17 | 2 | -7/+7 |
| | * | | Port QtCore uses of QTime as a stopwatch to QTimestamp. | Thiago Macieira | 2010-03-17 | 2 | -7/+7 |
* | | | | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 1 | -2/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Removed extra space from the command line passed to QProcess in Symbian | Miikka Heikkinen | 2010-03-19 | 1 | -2/+6 |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-19 | 4 | -9/+13 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60 | axis | 2010-03-18 | 1 | -6/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Handle Symbian's file name encoding, correctly. | Alessandro Portale | 2010-03-16 | 1 | -6/+10 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 3 | -3/+3 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-03-16 | 1 | -2/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-15 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 8 | -5/+44 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-01 | 6 | -17/+37 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-23 | 4 | -6/+23 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-19 | 3 | -14/+8 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 18 | -611/+599 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | axis | 2010-02-12 | 6 | -40/+56 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-01-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-01-21 | 73 | -218/+355 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2009-12-18 | 14 | -255/+261 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'possible_qmake_scope_fixes' | axis | 2009-12-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Fixed qmake scope specification. | axis | 2009-10-23 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-11-06 | 7 | -214/+254 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed incorrect header includes. | axis | 2009-10-23 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alan Alpert | 2010-03-17 | 6 | -117/+83 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-15 | 6 | -117/+83 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fix QDir::entryList regression | João Abecasis | 2010-03-12 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | Fix qmake crash on Windows | João Abecasis | 2010-03-11 | 1 | -5/+1 |
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-11 | 6 | -116/+86 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | doc: Fixed three new qdoc errors. | Martin Smith | 2010-03-11 | 3 | -6/+4 |
| | | * | | | | | | | | | | | | | Merge remote branch 'origin/4.7-cutoff' into 4.7 | Morten Johan Sørvig | 2010-03-10 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | QFSFileEngine reduce number of system calls | Ritt Konstantin | 2010-03-09 | 3 | -21/+33 |
| | | * | | | | | | | | | | | | | remove unneeded code from QFileInfo | Ritt Konstantin | 2010-03-09 | 2 | -55/+3 |
| | | * | | | | | | | | | | | | | QFSFileEngine: Don't use owner's permissions for current user; calculate them... | Ritt Konstantin | 2010-03-09 | 2 | -12/+22 |
| | | * | | | | | | | | | | | | | In QFSFileEngine::fileFlags call getPermissions() only if entry exists | Ritt Konstantin | 2010-03-09 | 1 | -24/+17 |
| | | * | | | | | | | | | | | | | move permissions calculation code to separate method | Ritt Konstantin | 2010-03-09 | 2 | -28/+37 |
* | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-15 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix importing qml modules from rcc resources | mae | 2010-03-11 | 1 | -2/+6 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-15 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Doc: Removed lie that access to QBuffer is unbuffered. | Simon Hausmann | 2010-03-11 | 1 | -2/+1 |
* | | | | | | | | | | | | | | make it possible to use sse2 with mingw | Thierry Bastian | 2010-03-11 | 1 | -1/+1 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | |