Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-08-31 | 66 | -858/+858 |
|\ | |||||
| * | Update tech preview license header. | Jason McDonald | 2009-08-31 | 65 | -845/+845 |
| * | Qt's domain name is now qt.nokia.com. | Jason McDonald | 2009-08-11 | 1 | -4/+4 |
| * | Update license headers. | Jason McDonald | 2009-08-11 | 65 | -65/+65 |
* | | doc: Fixed several qdoc errors. | Martin Smith | 2009-08-28 | 1 | -8/+8 |
* | | Doc: Small change to QProcess::waitForFinished() | Geir Vattekar | 2009-08-27 | 1 | -1/+2 |
* | | Merge branch 'mergeRequest' into 4.6 | axis | 2009-08-27 | 2 | -74/+59 |
|\ \ | |||||
| * | | move QFSFileEngine-related symbian code from qtemporaryfile to qfsfileengine | Ritt Konstantin | 2009-08-27 | 2 | -5/+4 |
| * | | remove symbianFileName stub once and for all | Ritt Konstantin | 2009-08-27 | 1 | -19/+17 |
| * | | fixes and improvements made after s60 branch has been merged into master | Ritt Konstantin | 2009-08-27 | 1 | -51/+39 |
* | | | reverting the definition of WINVER and _WIN32_WINNT in qglobal.h | Joerg Bornemann | 2009-08-26 | 1 | -0/+3 |
* | | | Doc: Noted a limitation in using slashes in settings section names. | David Boddie | 2009-08-26 | 1 | -3/+3 |
|/ / | |||||
* | | fix warnings on Windows CE | Joerg Bornemann | 2009-08-26 | 1 | -0/+2 |
* | | Merge commit 'origin/master' into 4.6 | Jason Barron | 2009-08-25 | 10 | -279/+297 |
|\ \ | |||||
| * \ | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-24 | 2 | -6/+4 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Shane Kearns | 2009-08-24 | 11 | -205/+676 |
| | |\ \ | |||||
| | * | | | Make the singleton file server session independent of QCoreApplication | Shane Kearns | 2009-08-24 | 2 | -6/+4 |
| * | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-24 | 11 | -205/+676 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-21 | 4 | -55/+42 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Review inspired changes to Symbian QProcess | Miikka Heikkinen | 2009-08-21 | 2 | -170/+175 |
| * | | | | Review inspired changes to Symbian file system watcher | Miikka Heikkinen | 2009-08-21 | 2 | -55/+58 |
| * | | | | Review inspired fixes to Symbian file engine | Miikka Heikkinen | 2009-08-21 | 6 | -50/+62 |
* | | | | | Reset dangling handle after close on WinCE 5 | João Abecasis | 2009-08-24 | 1 | -0/+3 |
* | | | | | Always check the file handle before attempting to map the file | João Abecasis | 2009-08-24 | 1 | -5/+8 |
* | | | | | QFSFileEngine: Don't close file if we already have a file for mapping | João Abecasis | 2009-08-24 | 1 | -1/+1 |
* | | | | | QFSFileEngine compile fix for NTFS symlink support | Joerg Bornemann | 2009-08-24 | 1 | -5/+8 |
* | | | | | Don't access usedHashFunc() if it's already been deleted. | Thiago Macieira | 2009-08-21 | 1 | -1/+2 |
* | | | | | QFSFileEngine compile fix for VS2005 | Joerg Bornemann | 2009-08-21 | 1 | -1/+1 |
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-08-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | QFSFileEngine compile fix for Windows with VS2005 | Joerg Bornemann | 2009-08-21 | 1 | -1/+1 |
* | | | | | | Merge branch 'master' of git@scm:qt/qt-s60-public | axis | 2009-08-21 | 32 | -123/+1921 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60 | axis | 2009-08-21 | 4 | -79/+189 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-08-21 | 9 | -126/+487 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Shane Kearns | 2009-08-20 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge commit 'qt/master' | Jason Barron | 2009-08-20 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Shane Kearns | 2009-08-20 | 4 | -3/+7 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-08-19 | 1 | -0/+4 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Changed names and URLs to reflect name change. | axis | 2009-08-19 | 3 | -3/+3 |
| * | | | | | | | performance: refactored use of RFs so corelib and gui share one session | Shane Kearns | 2009-08-20 | 3 | -54/+41 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Jason Barron | 2009-08-18 | 2 | -12/+21 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Shane Kearns | 2009-08-18 | 1 | -3/+4 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fixes to Symbian native engine for QFileSystemWatcher. | Shane Kearns | 2009-08-18 | 2 | -12/+21 |
| * | | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-18 | 17 | -165/+129 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Fixed merge failure in qfsfileengine_unix.cpp. | Miikka Heikkinen | 2009-08-14 | 1 | -3/+4 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Fix compilation of unix file engine. | Jason Barron | 2009-08-13 | 1 | -19/+20 |
| * | | | | | | | Merge commit 'qt/master' | Jason Barron | 2009-08-13 | 69 | -224/+227 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | s/class/struct/ | Harald Fernengel | 2009-08-10 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | mread | 2009-08-10 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge commit 'qt/master-stable' | Jason Barron | 2009-08-10 | 1 | -1/+11 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | moved declaration of engine to better match merge and to remove warning | mread | 2009-08-10 | 1 | -1/+2 |