summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-8/+8
|\
| * Fix gcc bug in qReallocAlignedOlivier Goffart2010-10-291-8/+8
* | Fix compilation in qglobal.h when included from a .c fileOlivier Goffart2010-10-301-3/+4
* | Fix compilation in namespaceOlivier Goffart2010-10-291-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-291-3/+22
|\ \
| * | qSwap: use std::swap as implementation, and specialize std::swap for our cont...Olivier Goffart2010-10-291-3/+22
* | | 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-272-2/+2
|\ \ \ | |/ /
| * | Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-262-2/+2
| |\ \
| | * | Support to build Qt for Symbian on Mac OS X with gcce compiler.Liang Qi2010-10-261-1/+1
| | * | Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-211-1/+1
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-262-20/+24
|\ \ \ \ | |/ / /
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-151-5/+5
| | |\ \
| | * | | Doc: Made Qt::TextLongestVariant internal again.David Boddie2010-10-141-2/+2
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-252-20/+24
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Changed language of the AutoConnection description.Jerome Pasion2010-10-151-5/+5
| | |/ /
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-071-1/+1
| | |\ \
| | * | | Clarified the auto connect enumeration regarding which type ofJerome Pasion2010-10-061-3/+5
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-041-1/+0
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of ../qt-doc-team-licenses into 4.7David Boddie2010-10-042-10/+10
| | |\ \ \ \
| | | * | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-042-10/+10
| | * | | | | Doc: Made documentation for Qt::TextLongestVariant public.David Boddie2010-10-041-7/+9
| | |/ / / /
* | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-222-1/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Phonon: Export ObjectDescriptionModel to prevent link errors with ClangTor Arne Vestbø2010-10-151-0/+5
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-10-011-1/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Fix a link that no longer exists in documentation.Robin Burchell2010-09-271-1/+1
| | | |/ / | | |/| |
* | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-223-9/+12
|\ \ \ \ \
| * | | | | Lighthouse on OS X.Morten Johan Sørvig2010-10-203-9/+12
| * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-055-35/+96
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-133-2/+14
| |\ \ \ \ \
* | \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-053-32/+57
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-1/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | moved fast allocator config to qt_hybridHeap_symbian_p.hmread2010-09-301-6/+0
| | * | | | new allocator tidy up and winscw freezemread2010-09-301-1/+1
| | * | | | Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platformsmread2010-09-301-0/+2
| | * | | | Add the new allocator to corelibShane Kearns2010-09-301-0/+3
| | | |_|/ | | |/| |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-283-31/+57
| |\ \ \ \ | | |/ / /
| | * | | Improved Symbian4 platform detectionMiikka Heikkinen2010-09-233-31/+57
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-221-1/+1
| | |\ \ \
| | | * | | Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QCharThiago Macieira2010-09-211-1/+1
| | * | | | Bump version to 4.7.1.Jason McDonald2010-09-211-2/+2
| | |/ / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-274-0/+52
|\ \ \ \ \ | |/ / / /
| * | | | Fix usage of QT_ARCH_ARM* after a28ddf6Bradley T. Hughes2010-09-231-1/+1
| * | | | Merge the armv6 and arm architecturesBradley T. Hughes2010-09-231-0/+3
| * | | | Adding C++0x support to MSVC2010Thierry Bastian2010-09-221-0/+13
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-212-0/+36
| |\ \ \ \ | | |/ / /