summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'b7692016f282251002b3e85dfcb5567bd91a12c0' of oslo-staging-1 int...Simon Hausmann2009-11-231-1/+5
|\
| * Fix regression introduced in 1e6b424b692b20dcfec920f8d3563e520ec1ff05João Abecasis2009-11-201-1/+5
* | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 int...Simon Hausmann2009-11-231-1/+1
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-201-6/+0
| |\
| * | Revert check for file size to a warning in QFile::mapJoão Abecasis2009-11-191-1/+1
* | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-201-1/+18
|\ \ \ | |_|/ |/| |
| * | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1913-167/+153
| |\ \
| * | | Complete QVariantAnimation doc to mention qRegisterAnimationInterpolatorThierry Bastian2009-11-191-1/+18
* | | | Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 i...Simon Hausmann2009-11-201-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Revert "Revert "Fix detection of linux-g++""Simon Hausmann2009-11-191-1/+1
* | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-198-134/+127
|\ \ \ \ | |/ / /
| * | | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-192-12/+17
| |\ \ \ | | |_|/ | |/| |
| | * | Fix the evaluation nag in binary installs with commercial licenses.Thiago Macieira2009-11-181-12/+14
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1812-51/+53
| | |\ \
| | * | | Fix regression introduced in 98a05681851db9d88b1364af52be543715fbe306João Abecasis2009-11-181-0/+3
| * | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-193-6/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Ran the script utils/normalizeOlivier Goffart2009-11-181-4/+4
| | * | | Export QStateMachine::WrappedEvent and QStateMachine::SignalEventEskil Abrahamsen Blomfeldt2009-11-181-2/+2
| | * | | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-1710-54/+84
| | |\ \ \
| | * | | | e32def.h include removes TRUE/FALSE redifine warnings on Symbian with gcce co...tomyri2009-11-171-0/+2
| * | | | | Revert "Fix detection of linux-g++"Paul Olav Tvete2009-11-191-1/+1
| * | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-183-117/+103
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-178-119/+864
| | |\ \ \
| | * | | | Removing unnecessary chunking and stat'ing when reading QIODeviceJoão Abecasis2009-11-171-54/+81
| | * | | | Fix regression introduced in c08e708037d33271825ce6a6a1ac640e96b70c36João Abecasis2009-11-171-4/+2
| | * | | | Fix QIODevice::getChar optimizationJoão Abecasis2009-11-171-46/+12
| | * | | | Remove needless loop in QIODevice::seekJoão Abecasis2009-11-171-12/+7
| | * | | | There should only be one write buffer at a time in QFileJoão Abecasis2009-11-171-1/+1
* | | | | | remove bogus doc paragraphs relating to codecForUtfText()Oswald Buddenhagen2009-11-191-6/+0
|/ / / / /
* | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-181-0/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-171-0/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Fix QT_NO_SHAREDMEMORY while not breaking the QNX buildJørgen Lind2009-11-161-0/+2
* | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1711-58/+86
|\ \ \ \ | |/ / /
| * | | Small doc fix.axis2009-11-171-1/+1
| * | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-179-53/+83
| |\ \ \ | | |/ / | |/| / | | |/
| | * doc: Fixed qdoc errors.Martin Smith2009-11-161-1/+1
| | * doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-161-3/+28
| | * Don't sendPostedEvents() twice when calling processEvents() manuallyBradley T. Hughes2009-11-161-6/+6
| | * Fix compilation on solaris-g++-64.Thiago Macieira2009-11-131-0/+1
| | * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-132-9/+9
| | |\
| | * | doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-131-6/+8
| | * | Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-133-16/+17
| | |\ \
| | | * | utils/qlalr generator: adapt changes to xmlstream and script filesPeter Hartmann2009-11-113-16/+17
| | * | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-121-0/+20
| | |\ \ \
| | * \ \ \ Merge branch '4.6' into osloStaging1-4.6Jocelyn Turcotte2009-11-121-21/+22
| | |\ \ \ \
| | | * | | | QUrl::fromUserInput: improvements, corrections and make the demoJocelyn Turcotte2009-11-121-21/+22
| * | | | | | Early return for allowMove within a parent QModelIndexStephen Kelly2009-11-131-4/+2
| * | | | | | Merge commit upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-133-1/+26
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-126-114/+861
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Shane Kearns2009-11-116-60/+29
| | |\ \ \ \ \ \