summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Added new functions to QTextCodec that accept ConversionFlags.Denis Dzyubenko2010-01-082-3/+57
* Merge branch '4.6'Thiago Macieira2010-01-084-10/+42
|\
| * doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-3/+4
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-051-2/+10
| |\
| | * Small optimization in QIODevice::readAll()Markus Goetz2010-01-051-2/+10
| * | doc: Added some missing macro descriptions.Martin Smith2010-01-051-4/+27
| |/
| * Fix typo in QFSFileEnginePrivate::canonicalizedMarkus Goetz2010-01-041-1/+1
| * doc: Removed a const from a declaration in the example.Martin Smith2010-01-041-1/+1
* | Don't use QTime::elapsed() on windows to query for the actual time.Jan-Arve Sæther2010-01-082-2/+62
* | Qt 5 comment added for QT_WA / QT_WA_INLINE removalJoerg Bornemann2010-01-061-0/+1
* | Our variables are our variables so we prefix them.Alexis Menard2010-01-061-1/+1
* | Merge branch '4.6'Thiago Macieira2010-01-053-14/+14
|\ \ | |/
| * QUrl::toEncoded() fix for the case of "password, but no username".David Faure2009-12-281-5/+9
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-262-9/+5
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-252-9/+5
| | |\
| | | * revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845Ritt Konstantin2009-12-232-9/+5
* | | | Merge branch '4.6'Thiago Macieira2009-12-2615-133/+220
|\ \ \ \ | |/ / /
| * | | Fix warning on 64-bit build with MSVC.Thiago Macieira2009-12-251-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2009-12-251-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | FTBFS on hurd-i386 because since clock_gettime is not available thereSamuel Thibault2009-12-251-0/+3
| | |/
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2009-12-233-8/+11
| |\ \ | | |/
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2009-12-222-23/+39
| | |\
| | * | Warn when calling QFileInfo::absolutePath() on an improper object.Andreas Kling2009-12-211-0/+2
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2009-12-192-8/+9
| | |\ \
| | | * | doc: Added a missing \sa command, plus a \l in the text.Martin Smith2009-12-181-7/+8
| | | * | Fixed QResource to respect the explicitely set localeDenis Dzyubenko2009-12-171-1/+1
| * | | | Revert "Daylight savings time for Symbian."Janne Koskinen2009-12-232-39/+23
| | |_|/ | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2009-12-2219-137/+231
| |\ \ \ | | |/ /
| | * | Optimize QThreadStorage with QVectorOlivier Goffart2009-12-182-48/+51
| | |/
| | * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-175-9/+19
| | |\
| | | * Avoid timer starvation when handling many X11 eventsBradley T. Hughes2009-12-172-0/+7
| | | * An optimisation to QTextStreamDenis Dzyubenko2009-12-161-5/+4
| | | * Do not call macToQtFormat twice in QLocale.Denis Dzyubenko2009-12-161-4/+4
| | | * Revert "Changes to support locale change event for symbian platform"Denis Dzyubenko2009-12-167-173/+17
| | | * Changes to support locale change event for symbian platformdka2009-12-157-17/+173
| | | * Fix compilation on HP-UX 11.11.Tristan Chabredier2009-12-151-0/+4
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2009-12-162-47/+111
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-1610-15/+28
| | | |\ \
| | | * | | qreal-izationAleksandar Sasha Babic2009-12-151-45/+109
| | * | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-145-5/+20
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Fix QMetaObject::connect and disconnect with "dynamic signals"Olivier Goffart2009-12-142-20/+24
| * | | | | Daylight savings time for Symbian.Janne Koskinen2009-12-222-23/+39
| | |_|/ / | |/| | |
| * | | | qreal-izationAleksandar Sasha Babic2009-12-111-2/+2
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-114-6/+19
| |\ \ \ \
* | | | | | Revert "remove obsolete QT_WA/QT_WA_INLINE macros"Joerg Bornemann2009-12-231-0/+3
* | | | | | remove obsolete QT_WA/QT_WA_INLINE macrosminiak2009-12-221-3/+0
* | | | | | fix small leftovers from the Win9x removal in the codeminiak2009-12-221-8/+7
* | | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-1513-41/+64
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-147-23/+39
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Fix warning in public headerOlivier Goffart2009-12-141-2/+2