Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 1 | -8/+8 |
|\ | |||||
| * | Fix gcc bug in qReallocAligned | Olivier Goffart | 2010-10-29 | 1 | -8/+8 |
* | | Fix compilation in qglobal.h when included from a .c file | Olivier Goffart | 2010-10-30 | 1 | -3/+4 |
* | | Fix compilation in namespace | Olivier Goffart | 2010-10-29 | 1 | -1/+1 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-10-29 | 1 | -3/+22 |
|\ \ | |||||
| * | | qSwap: use std::swap as implementation, and specialize std::swap for our cont... | Olivier Goffart | 2010-10-29 | 1 | -3/+22 |
* | | | Fix the license in files for Lighthouse | Jørgen Lind | 2010-10-28 | 3 | -117/+117 |
* | | | Fix typos found by the spellchecking autotest | Paul Olav Tvete | 2010-10-28 | 1 | -1/+1 |
* | | | Add missing QT_MODULE macros. | Paul Olav Tvete | 2010-10-28 | 1 | -0/+2 |
* | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-27 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'macMakefileBuildSupport' into master. | Liang Qi | 2010-10-26 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | Support to build Qt for Symbian on Mac OS X with gcce compiler. | Liang Qi | 2010-10-26 | 1 | -1/+1 |
| | * | | Renamed the symbian/linux-* mkspecs to symbian-*. | axis | 2010-10-21 | 1 | -1/+1 |
* | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 2 | -20/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-25 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-15 | 1 | -5/+5 |
| | |\ \ | |||||
| | * | | | Doc: Made Qt::TextLongestVariant internal again. | David Boddie | 2010-10-14 | 1 | -2/+2 |
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 2 | -20/+24 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Changed language of the AutoConnection description. | Jerome Pasion | 2010-10-15 | 1 | -5/+5 |
| | |/ / | |||||
| | * | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-07 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | Clarified the auto connect enumeration regarding which type of | Jerome Pasion | 2010-10-06 | 1 | -3/+5 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-04 | 1 | -1/+0 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of ../qt-doc-team-licenses into 4.7 | David Boddie | 2010-10-04 | 2 | -10/+10 |
| | |\ \ \ \ | |||||
| | | * | | | | Doc: Fixed the in-repository licenses for the documentation. | David Boddie | 2010-10-04 | 2 | -10/+10 |
| | * | | | | | Doc: Made documentation for Qt::TextLongestVariant public. | David Boddie | 2010-10-04 | 1 | -7/+9 |
| | |/ / / / | |||||
* | | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 2 | -1/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Phonon: Export ObjectDescriptionModel to prevent link errors with Clang | Tor Arne Vestbø | 2010-10-15 | 1 | -0/+5 |
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-07 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-10-01 | 1 | -1/+0 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Fix a link that no longer exists in documentation. | Robin Burchell | 2010-09-27 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 3 | -9/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Lighthouse on OS X. | Morten Johan Sørvig | 2010-10-20 | 3 | -9/+12 |
| * | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-10-05 | 5 | -35/+96 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-09-13 | 3 | -2/+14 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 3 | -32/+57 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | moved fast allocator config to qt_hybridHeap_symbian_p.h | mread | 2010-09-30 | 1 | -6/+0 |
| | * | | | | new allocator tidy up and winscw freeze | mread | 2010-09-30 | 1 | -1/+1 |
| | * | | | | Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platforms | mread | 2010-09-30 | 1 | -0/+2 |
| | * | | | | Add the new allocator to corelib | Shane Kearns | 2010-09-30 | 1 | -0/+3 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 3 | -31/+57 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Improved Symbian4 platform detection | Miikka Heikkinen | 2010-09-23 | 3 | -31/+57 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-09-22 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar | Thiago Macieira | 2010-09-21 | 1 | -1/+1 |
| | * | | | | Bump version to 4.7.1. | Jason McDonald | 2010-09-21 | 1 | -2/+2 |
| | |/ / / | |||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 4 | -0/+52 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix usage of QT_ARCH_ARM* after a28ddf6 | Bradley T. Hughes | 2010-09-23 | 1 | -1/+1 |
| * | | | | Merge the armv6 and arm architectures | Bradley T. Hughes | 2010-09-23 | 1 | -0/+3 |
| * | | | | Adding C++0x support to MSVC2010 | Thierry Bastian | 2010-09-22 | 1 | -0/+13 |
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 2 | -0/+36 |
| |\ \ \ \ | | |/ / / |