Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Squashed merge of the master-temp branch. | David Boddie | 2011-05-06 | 2 | -2/+2 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-03 | 2 | -3/+1 |
|\ | |||||
| * | Merge remote-tracking branch 'earth-team/master' into earth-staging-master | Olivier Goffart | 2011-04-20 | 2 | -3/+1 |
| |\ | |||||
| | * | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network | Shane Kearns | 2011-04-12 | 2 | -3/+1 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into symbian-socke... | Shane Kearns | 2011-04-11 | 11 | -201/+183 |
| | | |\ | |||||
| | | * \ | Merge remote branch 'earth/master' into symbian-socket-engine | Shane Kearns | 2011-03-25 | 20 | -18/+49 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networ... | Shane Kearns | 2011-03-08 | 1 | -2/+0 |
| | | |\ \ \ | |||||
| | | | * | | | bugfix: QDir::entryList(Files|Readable) not listing writable files | Shane Kearns | 2011-02-24 | 1 | -2/+0 |
| | | | * | | | Merge remote branch 'qt/master' into symbian-socket-engine | Shane Kearns | 2011-02-07 | 75 | -149/+456 |
| | | | |\ \ \ | |||||
| | | | * | | | | Fix for using search paths with a dirty path | Shane Kearns | 2011-02-03 | 1 | -1/+1 |
| | | | * | | | | Merge remote branch 'qt/master' into symbian-socket-engine | Shane Kearns | 2010-12-15 | 33 | -2761/+5587 |
| | | | |\ \ \ \ | |||||
| | | * | \ \ \ \ | Merge remote branch 'earth/master' into symbian-socket-engine | Shane Kearns | 2011-03-08 | 90 | -2919/+6059 |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | Prototype socket manager | Shane Kearns | 2010-12-01 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-04-18 | 11 | -229/+207 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-04-18 | 2 | -181/+98 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 1 | -13/+15 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 7 | -16/+73 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix compilation | Olivier Goffart | 2011-04-04 | 1 | -2/+2 |
| | * | | | | | | | | QTemporaryFile: Locate placeholder before re-encoding | João Abecasis | 2011-04-04 | 1 | -31/+40 |
| | * | | | | | | | | Prefer use of QByteArray to qstrdup and manual memory management | João Abecasis | 2011-04-04 | 1 | -9/+6 |
| | * | | | | | | | | Check for null no longer needed | João Abecasis | 2011-04-04 | 1 | -2/+0 |
| | * | | | | | | | | Don't overrun XXXXXX placeholder when generating next filename | João Abecasis | 2011-04-04 | 1 | -3/+1 |
| | * | | | | | | | | Split argument validation of _gettemp as separate function | João Abecasis | 2011-04-04 | 1 | -25/+51 |
| | * | | | | | | | | Remove duplication with QCoreApplication::applicationId | João Abecasis | 2011-04-04 | 1 | -19/+5 |
| | * | | | | | | | | Adding comments; variable scoping | João Abecasis | 2011-04-04 | 1 | -22/+30 |
| | * | | | | | | | | Don't pre-check if directory exists as it's unnecessary | João Abecasis | 2011-04-04 | 1 | -35/+0 |
| | * | | | | | | | | QTemporaryFile: More dead code elimination | João Abecasis | 2011-04-04 | 1 | -84/+29 |
| | * | | | | | | | | Removing dead code in QTemporaryFile | João Abecasis | 2011-04-04 | 1 | -18/+4 |
| | * | | | | | | | | Remove duplicate #include | João Abecasis | 2011-04-04 | 1 | -1/+0 |
| | * | | | | | | | | Compile with QStringBuilder and QByteArray | Olivier Goffart | 2011-04-01 | 1 | -2/+2 |
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-13 | 1 | -15/+10 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Remove a race condition in SIGCHLD handler. | Thiago Macieira | 2011-04-13 | 1 | -15/+10 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 1 | -13/+15 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Merge remote-tracking branch 'mainline/4.7' into 4.7 | Oswald Buddenhagen | 2011-03-31 | 2 | -7/+8 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | QDirIterator returns hidden directories when it should only return files | Carlos Manuel Duclos Vergara | 2011-03-30 | 1 | -13/+15 |
| * | | | | | | | | | Merge remote branch 'qt-master/master' | Guoqing Zhang | 2011-04-05 | 11 | -14/+93 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-05 | 3 | -0/+51 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Add methods for traversing and combining QProcessEnvironment. | Thomas Sondergaard | 2011-04-04 | 3 | -0/+51 |
| | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 2 | -7/+8 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | / / / / / / | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Doc: Removed links to obsolete API in QResource | Geir Vattekar | 2011-03-17 | 1 | -3/+3 |
| | | * | | | | | | | Doc: Clarified the -1 return value of QIODevice::readData(). | David Boddie | 2011-02-17 | 1 | -4/+5 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-03-25 | 1 | -4/+11 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | QDir: Fix absolute paths when using file engines | João Abecasis | 2011-03-18 | 1 | -4/+11 |
| | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| * | | | | | | | | Merge remote branch 'qt-master/master' | Guoqing Zhang | 2011-03-16 | 15 | -14/+15 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote branch 'qt-master/master' | Guoqing Zhang | 2011-03-09 | 5 | -10/+28 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Don't leave from QNotifyChangeEvent::RunL() in QFileSystemWatcher | Miikka Heikkinen | 2011-03-04 | 1 | -1/+4 |
| * | | | | | | | | | | Fix QProcess::waitForFinished WaitForRequest handling in Symbian | Miikka Heikkinen | 2011-03-03 | 1 | -8/+7 |
| * | | | | | | | | | | Added a note to docs about killing processes in Symbian. | Miikka Heikkinen | 2011-03-03 | 1 | -0/+3 |
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-03-25 | 18 | -17/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fix warning about "data" being unused. | Thiago Macieira | 2011-03-22 | 1 | -0/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | |