Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-12-21 | 12 | -702/+390 |
|\ | |||||
| * | Fixed PREPEND_INCLUDEPATH being executed too early. | axis | 2010-12-21 | 3 | -16/+15 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-12-21 | 10 | -701/+390 |
| |\ | |||||
| | *-. | Merge branches 'nonQtApps-fix' and 'merge-request-2516' into master-s60 | axis | 2010-12-20 | 10 | -701/+390 |
| | |\ \ | |||||
| | | | * | Fixed autotest. | axis | 2010-12-20 | 1 | -1/+1 |
| | | | * | get rid of QPrinterInfoPrivate::isNull member | Konstantin Ritt | 2010-12-20 | 2 | -3/+2 |
| | | | * | QPrinterInfo::supportedPaperSizes(): return early if the info is invalid | Konstantin Ritt | 2010-12-20 | 3 | -0/+7 |
| | | | * | fix QPrinterInfo::defaultPrinter() on win | Konstantin Ritt | 2010-12-20 | 1 | -9/+8 |
| | | | * | micro-optimizations, clean-ups and styling fixes | Konstantin Ritt | 2010-12-20 | 3 | -98/+83 |
| | | | * | refactoring of QPrinterInfo | Konstantin Ritt | 2010-12-20 | 7 | -363/+209 |
| | | | * | minor refactoring of QPrinterInfoPrivate | Konstantin Ritt | 2010-12-20 | 3 | -100/+32 |
| | | | * | use binary search int the string2PaperSize() helper | Konstantin Ritt | 2010-12-20 | 1 | -143/+64 |
| | | * | | Moved the default dependency targets to default_post.prf. | axis | 2010-12-20 | 2 | -47/+47 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-12-21 | 1 | -4/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix the redirection of painting for the toolbar. | Fabien Freling | 2010-12-20 | 1 | -4/+4 |
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-12-20 | 76 | -217/+727 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-12-20 | 11 | -13/+97 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-12-20 | 11 | -13/+97 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Setting TextInput.cursorPosition outside bounds crashed. | Martin Jones | 2010-12-20 | 4 | -0/+30 |
| | | * | | | | | Update test bitmaps for QDeclarativeImage::svg() autotest on Windows | Joona Petrell | 2010-12-20 | 2 | -0/+0 |
| | | * | | | | | Don't truncate image:// url strings prematurely | Bea Lam | 2010-12-20 | 3 | -12/+62 |
| | | * | | | | | Update docs on importing javascript files | Bea Lam | 2010-12-20 | 2 | -1/+5 |
| | |/ / / / / | |||||
| * | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 65 | -204/+630 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-12-20 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix deployment of minehunt for Symbian | Damian Jansen | 2010-12-20 | 1 | -1/+1 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-12-20 | 1 | -0/+3 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Quiet unused parameter warnings. | Aaron McCarthy | 2010-12-20 | 1 | -0/+3 |
| | |/ / / / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-12-18 | 1 | -1/+7 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-12-18 | 1 | -1/+7 |
| | | |\ \ \ \ | | |/ / / / / | |||||
| | | * | | | | Use relative include instead of absolute in default qmake.conf | Miikka Heikkinen | 2010-12-17 | 1 | -1/+7 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-12-17 | 1 | -1/+2 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Ville Pernu | 2010-12-17 | 12 | -36/+120 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Fix waitForOpened not working with already active configuration | Ville Pernu | 2010-12-17 | 1 | -1/+2 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-12-17 | 5 | -12/+10 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | Fix QDeclarativeState::reset() autotest | Joona Petrell | 2010-12-17 | 3 | -12/+10 |
| | | * | | | | | | Update test bitmaps for QDeclarativeImage::svg() autotest on Linux | Joona Petrell | 2010-12-17 | 2 | -0/+0 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-12-17 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Fix incorrect file name case for OpenGL libraries in symbian.conf. | Miikka Heikkinen | 2010-12-17 | 1 | -4/+4 |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-12-17 | 4 | -1/+8 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-12-16 | 4 | -1/+8 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Add work around for bug when painting w/glTexSubImage into large texture | Eskil Abrahamsen Blomfeldt | 2010-12-16 | 4 | -1/+8 |
| | | | | |_|/ / / / | | | | |/| | | | | | |||||
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-12-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Doc: typo fixed in doc/src/declarative/extending.qdoc | Joerg Bornemann | 2010-12-16 | 1 | -1/+1 |
| | | | |/ / / / / | | | |/| | | | | | |||||
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-12-16 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | QmlDebugger: Fix runtime warnings about unregistered metatypes | Kai Koehne | 2010-12-16 | 1 | -1/+4 |
| | | |/ / / / / | |||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-12-16 | 3 | -2/+48 |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | | * | | | | | Improved orientation change autotest | Miikka Heikkinen | 2010-12-16 | 2 | -0/+44 |
| | | * | | | | | Avoid duplicate resize event | Miikka Heikkinen | 2010-12-16 | 1 | -2/+4 |
| | | |/ / / / | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int... | Qt Continuous Integration System | 2010-12-16 | 7 | -32/+67 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team | Qt Continuous Integration System | 2010-12-15 | 9 | -34/+118 |
| | | |\ \ \ \ |