Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-05-28 | 41 | -930/+1336 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | tst_qtextcodec: Fix broken merge conflict resolution | Olivier Goffart | 2010-05-28 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | tst_qtextcodec: Fix broken merge conflict resolution | Thiago Macieira | 2010-05-28 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-05-28 | 40 | -929/+1335 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-05-27 | 40 | -929/+1335 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-27 | 1 | -0/+24 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | Added some changes for 4.6.3 | Jens Bache-Wiig | 2010-05-27 | 1 | -0/+24 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-05-27 | 1 | -0/+4 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined. | Liang Qi | 2010-05-27 | 1 | -0/+4 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-26 | 2 | -8/+305 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Allow auto-test to compile when using namespaces | João Abecasis | 2010-05-26 | 1 | -4/+5 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | Fix regression in QVarLengthArray::operator= | João Abecasis | 2010-05-26 | 2 | -8/+304 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-26 | 1 | -0/+45 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | My 4.6.3 changes | Sami Merila | 2010-05-26 | 1 | -0/+45 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-05-26 | 2 | -1/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Removed unnecessary PlatSec capabilities from spectrum demo DLL | Gareth Stockwell | 2010-05-26 | 2 | -2/+2 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | Added missing PlatSec capabilities to spectrum demo DLL | Gareth Stockwell | 2010-05-26 | 1 | -0/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-05-26 | 1 | -4/+4 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Make test work with shadow builds again. | Andreas Aardal Hanssen | 2010-05-26 | 1 | -4/+4 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-26 | 1 | -181/+179 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Tidy changes file for 4.6.3. | Jason McDonald | 2010-05-26 | 1 | -219/+137 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | My 4.6.3 changes | Miikka Heikkinen | 2010-05-26 | 1 | -4/+84 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-26 | 2 | -4/+10 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Gareth Stockwell | 2010-05-25 | 1 | -0/+8 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-25 | 1 | -4/+4 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | My 4.6.3 changes | Gareth Stockwell | 2010-05-25 | 1 | -0/+6 | |
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Don't use QAtomicInt in statics because they are non-POD. | Thiago Macieira | 2010-05-25 | 1 | -4/+4 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-05-25 | 30 | -714/+760 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | / / / / / / / / / / / / / / / / / / / / / | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. | Liang Qi | 2010-05-25 | 2 | -2/+17 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Build fix for spectrum demo when -qtnamespace is used | Gareth Stockwell | 2010-05-25 | 9 | -24/+27 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Fixed license headers in spectrum demo | Gareth Stockwell | 2010-05-25 | 28 | -688/+716 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-05-25 | 1 | -0/+8 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Qt app draws background incorrectly when animated wallpaper is used | Sami Merila | 2010-05-25 | 1 | -0/+8 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-05-25 | 2 | -7/+12 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | QTBUG-5955: Qt fails to build on alpha architecture | Fathi Boudra | 2010-05-25 | 2 | -7/+12 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-28 | 7 | -13/+156 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug where testlib would not respect the -iterations option. | Samuel Rødal | 2010-05-28 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Improve precision of testlib benchmarking. | Samuel Rødal | 2010-05-28 | 2 | -1/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | QMetaMethod::invoke: Document that the function does not check the arguments | Olivier Goffart | 2010-05-28 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | add test for QMetaMethod::invoke | Olivier Goffart | 2010-05-28 | 1 | -0/+51 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Make QGLBuffer copiable | Rhys Weatherley | 2010-05-28 | 2 | -11/+90 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-05-28 | 5 | -320/+167 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-05-28 | 47 | -327/+566 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | fix visibility detection for g++ with a qualified binary name | Oswald Buddenhagen | 2010-05-28 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc: Fixed the model/view programming page; tried a style change. | Martin Smith | 2010-05-28 | 4 | -319/+166 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-28 | 11 | -48/+85 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Active window focus gain should not open virtual keypad | Joona Petrell | 2010-05-28 | 5 | -6/+27 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-05-28 | 209 | -1644/+2959 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Use QElapsedTimer rather than QTime::elapsed() | Martin Jones | 2010-05-28 | 6 | -42/+58 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-28 | 8 | -102/+146 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |