summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-271-0/+4
|\
| * Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.Liang Qi2010-05-271-0/+4
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-262-8/+305
|\ \
| * | Allow auto-test to compile when using namespacesJoão Abecasis2010-05-261-4/+5
| * | Fix regression in QVarLengthArray::operator=João Abecasis2010-05-262-8/+304
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-261-0/+45
|\ \ | |/ |/|
| * My 4.6.3 changesSami Merila2010-05-261-0/+45
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-262-1/+2
|\ \
| * | Removed unnecessary PlatSec capabilities from spectrum demo DLLGareth Stockwell2010-05-262-2/+2
| * | Added missing PlatSec capabilities to spectrum demo DLLGareth Stockwell2010-05-261-0/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-261-4/+4
|\ \ \
| * | | Make test work with shadow builds again.Andreas Aardal Hanssen2010-05-261-4/+4
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-261-181/+179
|\ \ \ \ | | |_|/ | |/| |
| * | | Tidy changes file for 4.6.3.Jason McDonald2010-05-261-219/+137
| * | | My 4.6.3 changesMiikka Heikkinen2010-05-261-4/+84
|/ / /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-262-4/+10
|\ \ \
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Gareth Stockwell2010-05-251-0/+8
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-251-4/+4
| | |\ \ \
| * | | | | My 4.6.3 changesGareth Stockwell2010-05-251-0/+6
| | |/ / / | |/| | |
| * | | | Don't use QAtomicInt in statics because they are non-POD.Thiago Macieira2010-05-251-4/+4
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-2530-714/+760
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.Liang Qi2010-05-252-2/+17
| * | | Build fix for spectrum demo when -qtnamespace is usedGareth Stockwell2010-05-259-24/+27
| * | | Fixed license headers in spectrum demoGareth Stockwell2010-05-2528-688/+716
|/ / /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-251-0/+8
|\ \ \
| * | | Qt app draws background incorrectly when animated wallpaper is usedSami Merila2010-05-251-0/+8
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-252-7/+12
|\ \ \ \ | | |/ / | |/| |
| * | | QTBUG-5955: Qt fails to build on alpha architectureFathi Boudra2010-05-252-7/+12
|/ / /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-244-35/+84
|\ \ \ | |/ / |/| |
| * | Fix a race condition with QtDBus blocking for replies.Thiago Macieira2010-05-244-34/+83
| * | QtDBus: Debug message updateThiago Macieira2010-05-241-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-213-14/+19
|\ \ \ | |_|/ |/| |
| * | Removed DEPLOYMENT from demos/spectrum/spectrum.proGareth Stockwell2010-05-211-13/+0
| * | Install source for spectrum demoGareth Stockwell2010-05-213-0/+18
| * | Fixed path for copying launcher script for spectrum demoGareth Stockwell2010-05-211-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-213-15/+88
|\ \ \ | |_|/ |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-213-15/+88
| |\ \
| | * | Fixed an assert in QMenuThierry Bastian2010-05-212-11/+55
| | * | Call eglTerminate() when the last QEglContext is destroyed to free mem.Trond Kjernåsen2010-05-211-4/+33
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-2143-17/+278235
|\ \ \ \ | |_|_|/ |/| | |
| * | | My 4.6.3 changes.Yoann Lopes2010-05-211-0/+21
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-217-17/+206
| * | | tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64Thiago Macieira2010-05-2135-0/+278008
| |/ /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-217-30/+86
|\ \ \ | |/ / |/| |
| * | Backport multitouch bug fixes to 4.6Shane Kearns2010-05-212-7/+19
| * | Removed double EINTR loop from nativeWrite and nativeRead.Janne Anttila2010-05-211-8/+2
| * | Fixed qsslkey test deployment for Symbian and fixed compiler warnings.Janne Anttila2010-05-212-5/+9
| * | Fixing the race condition in event dispatcher implementation onAleksandar Sasha Babic2010-05-212-10/+56
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-211-1/+21
|\ \ \ | |/ / |/| |
| * | changes-4.6.3 updatedJoerg Bornemann2010-05-211-1/+21