summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2420-58/+911
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2220-58/+911
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-216-14/+140
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | | | Enable QTouchEvent for S60 5.0Shane Kearns2010-05-213-12/+45
| | | | | | | | | | * | | | | | | | | | | | Add missing license header.Jason McDonald2010-05-211-0/+41
| | | | | | | | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2019-46/+823
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-2019-46/+823
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * | | | | | | | | | | | Fix build error on S60 3.1 environmentsMiikka Heikkinen2010-05-201-2/+2
| | | | | | | | | | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7Jani Hautakangas2010-05-201616-68573/+33936
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | | | | | | | Fix replacement functions in platform_paths.prfMiikka Heikkinen2010-05-201-2/+0
| | | | | | | | | | | | * | | | | | | | | | | | | QRuntimeGraphicsSystemJani Hautakangas2010-05-2017-42/+821
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-2841-930/+1336
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | tst_qtextcodec: Fix broken merge conflict resolutionOlivier Goffart2010-05-281-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | tst_qtextcodec: Fix broken merge conflict resolutionThiago Macieira2010-05-281-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-2840-929/+1335
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2740-929/+1335
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-271-0/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | Added some changes for 4.6.3Jens Bache-Wiig2010-05-271-0/+24
| | | * | | | | | | | | | | | | | | | | | | | | | | 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.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-287-13/+156
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug where testlib would not respect the -iterations option.Samuel Rødal2010-05-281-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Improve precision of testlib benchmarking.Samuel Rødal2010-05-282-1/+7