summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
Commit message (Expand)AuthorAgeFilesLines
* QFSFileEngine compile fix for VS2005Joerg Bornemann2009-08-211-1/+1
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-211-1/+1
|\
| * QFSFileEngine compile fix for Windows with VS2005Joerg Bornemann2009-08-211-1/+1
* | Merge branch 'master' of git@scm:qt/qt-s60-publicaxis2009-08-2132-123/+1921
|\ \ | |/ |/|
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-214-79/+189
| |\
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-219-126/+487
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-201-1/+1
| |\ \ \
| | * \ \ Merge commit 'qt/master'Jason Barron2009-08-201-1/+1
| | |\ \ \
| * | \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-204-3/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-0/+4
| | |\ \ \ \
| | * | | | | Changed names and URLs to reflect name change.axis2009-08-193-3/+3
| * | | | | | performance: refactored use of RFs so corelib and gui share one sessionShane Kearns2009-08-203-54/+41
| |/ / / / /
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-182-12/+21
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-181-3/+4
| | |\ \ \ \ \
| | * | | | | | Fixes to Symbian native engine for QFileSystemWatcher.Shane Kearns2009-08-182-12/+21
| * | | | | | | Merge commit 'qt/master'Jason Barron2009-08-1817-165/+129
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fixed merge failure in qfsfileengine_unix.cpp.Miikka Heikkinen2009-08-141-3/+4
| | |/ / / / / | |/| | | | |
| * | | | | | Fix compilation of unix file engine.Jason Barron2009-08-131-19/+20
| * | | | | | Merge commit 'qt/master'Jason Barron2009-08-1369-224/+227
| |\ \ \ \ \ \
| * | | | | | | s/class/struct/Harald Fernengel2009-08-101-1/+1
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-101-1/+11
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-08-101-1/+11
| | |\ \ \ \ \ \ \
| * | | | | | | | | moved declaration of engine to better match merge and to remove warningmread2009-08-101-1/+2
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-0746-1676/+1974
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Update license headers according to commit 858c70f768e.axis2009-08-063-9/+9
| | * | | | | | | | Replaced $MODULE$ with hardcoded module names.axis2009-08-063-3/+3
| | * | | | | | | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-0615-15/+15
| | * | | | | | | | Merge commit 'origin/master'Jason Barron2009-08-0420-32/+34
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-08-046-6/+30
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-07-301-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-07-288-21/+626
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-07-2723-1627/+1301
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fixing memory leaks in dir iteratormread2009-08-062-8/+21
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Trailing whitespace and tab/space fixes for src/corelibJanne Anttila2009-08-042-2/+2
| * | | | | | | | | | | | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-0320-30/+32
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-093-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-072-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Removed pointless variables to silence warnings from RVCT.axis2009-07-061-3/+1
| | * | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2965-131/+131
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3067-226/+202
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2526-307/+1160
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | report and continue policy for exceptions in all Qt threadsmread2009-06-181-1/+2
| * | | | | | | | | | | | | | | | Make Qt exception safer.Robert Griebl2009-06-1019-74/+73
| * | | | | | | | | | | | | | | | Merge branch 'imSelections'axis2009-06-033-3/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Fixed incorrect headers.axis2009-06-033-3/+93
| * | | | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-06-022-17/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-022-17/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fixed qiodevice compilation error when QIODEVICE_DEBUG is defined.Janne Anttila2009-06-021-2/+2
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Compile on Qt/Symbian.Jason Barron2009-05-251-1/+0
| * | | | | | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-256-138/+220
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \