summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream'Thierry Bastian2011-04-2816-53/+703
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-212-5/+24
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-212-5/+25
| | |\
| | | * Drift correction and better accuracy for repeating timers in Symbianmread2011-04-202-5/+25
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-204-13/+26
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-184-13/+26
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-182-11/+23
| | | |\ \ | | | | |/
| | | | * Add new QSysInfo::symbianVersion() enumsMiikka Heikkinen2011-04-182-11/+23
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-132-0/+3
| | | |\ \ | | | | |/
| | | | * Use FixNativeOrientation on Symbian when the application wants it.Laszlo Agocs2011-04-122-0/+3
| | | | * Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-2917-185/+145
| | | | |\
| * | | | \ Merge remote-tracking branch 'earth-team/master' into earth-staging-masterOlivier Goffart2011-04-2012-35/+653
| |\ \ \ \ \
| | * | | | | QLocale: Fixed double to currency string conversion on Mac.Denis Dzyubenko2011-04-141-1/+1
| | * | | | | Applying the QTBUG-17986 fix to Symbianmread2011-04-123-0/+21
| | * | | | | Added support for libICU for collation and toLower/toUpper.Denis Dzyubenko2011-04-124-1/+277
| | * | | | | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networkShane Kearns2011-04-128-34/+355
| | |\ \ \ \ \
| | | * | | | | Fix regression with Qt::AutoConnectionShane Kearns2011-04-121-0/+2
| | | * | | | | Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into symbian-socke...Shane Kearns2011-04-1173-1271/+2587
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-2566-8652/+11553
| | | |\ \ \ \ \ \
| | | * | | | | | | Fixes to QSystemErrorShane Kearns2011-03-221-2/+2
| | | * | | | | | | Implement QEventLoop::ExcludeSocketNotifiers for symbian socket engineShane Kearns2011-03-172-35/+57
| | | * | | | | | | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networ...Shane Kearns2011-03-085-9/+127
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | bugfix: QDir::entryList(Files|Readable) not listing writable filesShane Kearns2011-02-241-2/+0
| | | | * | | | | | | Fix thread starvation when processEvents() is called in a tight loopShane Kearns2011-02-161-0/+8
| | | | * | | | | | | Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-07482-763/+1459
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Fix GCC compiler warningShane Kearns2011-02-071-1/+1
| | | | * | | | | | | | Fix for using search paths with a dirty pathShane Kearns2011-02-031-1/+1
| | | | * | | | | | | | Use the global message pool to avoid KErrServerBusy errorsShane Kearns2011-01-211-1/+3
| | | | * | | | | | | | Add QScopedValueRollback tools class.Shane Kearns2011-01-173-3/+169
| | | | * | | | | | | | Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2010-12-1545-2830/+6039
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fixes for socket engine autotest failuresShane Kearns2010-12-101-1/+1
| | | | * | | | | | | | | Fix some crashes in the symbian socket engineShane Kearns2010-12-091-2/+6
| | | | * | | | | | | | | Helper functions for synchronously waiting on an active object to completeShane Kearns2010-12-072-1/+83
| | | | * | | | | | | | | default RConnection for socketsShane Kearns2010-12-072-2/+26
| | | * | | | | | | | | | Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-08506-3692/+7934
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Set preferences in socket server Connect()Shane Kearns2010-12-061-1/+6
| | | * | | | | | | | | | Add socket manager to corelibShane Kearns2010-12-062-13/+48
| | | * | | | | | | | | | Prototype socket managerShane Kearns2010-12-013-1/+140
* | | | | | | | | | | | | Merge branch 'master-upstream'Thierry Bastian2011-04-1978-9405/+13223
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-191-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-191-0/+6
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-181-16/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-04-142-24/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Replace the handcoded math and change the timer buckets again.Thiago Macieira2011-04-141-11/+40
| | * | | | | | | | | | | | | Move the constants up, preparing for refactoringThiago Macieira2011-04-141-4/+5
| | * | | | | | | | | | | | | Change the number of entries in the first timer bucket.Thiago Macieira2011-04-131-4/+8
| | * | | | | | | | | | | | | Change the error message in the timer ID deallocator.Thiago Macieira2011-04-131-1/+2
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-04-1840-8863/+11799
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | QLocale: Fixed double to currency string conversion on Mac.Denis Dzyubenko2011-04-141-1/+1
| | * | | | | | | | | | | | | | Compile on Mac.Olivier Goffart2011-04-132-10/+11
| | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |