summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Compile when PATH_MAX is not definedOlivier Goffart2010-11-011-0/+4
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-304-3/+59
|\
| * Fix compilation in qglobal.h when included from a .c fileOlivier Goffart2010-10-301-3/+4
| * Fix compilation in namespaceOlivier Goffart2010-10-294-5/+5
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-294-3/+58
| |\
| | * qSwap: use std::swap as implementation, and specialize std::swap for our cont...Olivier Goffart2010-10-294-3/+58
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-8/+13
|\ \ \ | |/ / |/| |
| * | Fix memory leak on exitHarald Fernengel2010-10-291-8/+13
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-2929-42/+736
|\ \ \ | |_|/ |/| |
| * | Fix the license in files for LighthouseJørgen Lind2010-10-283-117/+117
| * | Fix typos found by the spellchecking autotestPaul Olav Tvete2010-10-281-1/+1
| * | Add missing QT_MODULE macros.Paul Olav Tvete2010-10-281-0/+2
| * | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-273-24/+10
| |\ \
| * \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2636-140/+175
| |\ \ \
| * \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2214-40/+92
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-2212-16/+49
| |\ \ \ \ \
| | * | | | | Lighthouse on OS X.Morten Johan Sørvig2010-10-2012-16/+49
| | * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-0546-350/+7025
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1328-754/+1162
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-0525-114/+6609
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Compile when detecting ARMv5Bradley T. Hughes2010-09-271-1/+1
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2740-587/+1085
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1346-768/+1685
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-262-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-268-21/+32
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Clean up lighthouse header filesPaul Olav Tvete2010-08-202-1/+9
| * | | | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-2620-63/+207
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-191-19/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-1925-108/+111
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-1947-499/+314
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Compile on Symbian after commit 075e96eba5001Paul Olav Tvete2010-08-181-1/+1
| * | | | | | | | | | | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterJørgen Lind2010-08-059-35/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-0327-112/+207
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-0421-102/+214
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-1920-27/+678
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-1427-159/+202
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-2418-322/+241
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Adding -qpa configure switchJørgen Lind2010-06-241-1/+1
| | * | | | | | | | | | | | | | | | | | Say hello to Q_WS_QPA!Jørgen Lind2010-06-245-11/+11
| | * | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-1869-2444/+2971
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Hardcode qDetectCPUFeatures to 0 for NaCl.Morten Johan Sørvig2010-05-141-1/+6
| | * | | | | | | | | | | | | | | | | | | Say hello to Qt for Native Client.Morten Johan Sørvig2010-05-1415-14/+651
| | * | | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-1032-202/+381
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-2186-2641/+6681
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-1822-312/+742
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-1138-2182/+3184
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-0190-1080/+2675
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-1032-141/+226
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-14459-1287/+1717
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-1998-1588/+3744
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \