summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-2112-702/+390
|\
| * Fixed PREPEND_INCLUDEPATH being executed too early.axis2010-12-213-16/+15
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-2110-701/+390
| |\
| | *-. Merge branches 'nonQtApps-fix' and 'merge-request-2516' into master-s60axis2010-12-2010-701/+390
| | |\ \
| | | | * Fixed autotest.axis2010-12-201-1/+1
| | | | * get rid of QPrinterInfoPrivate::isNull memberKonstantin Ritt2010-12-202-3/+2
| | | | * QPrinterInfo::supportedPaperSizes(): return early if the info is invalidKonstantin Ritt2010-12-203-0/+7
| | | | * fix QPrinterInfo::defaultPrinter() on winKonstantin Ritt2010-12-201-9/+8
| | | | * micro-optimizations, clean-ups and styling fixesKonstantin Ritt2010-12-203-98/+83
| | | | * refactoring of QPrinterInfoKonstantin Ritt2010-12-207-363/+209
| | | | * minor refactoring of QPrinterInfoPrivateKonstantin Ritt2010-12-203-100/+32
| | | | * use binary search int the string2PaperSize() helperKonstantin Ritt2010-12-201-143/+64
| | | * | Moved the default dependency targets to default_post.prf.axis2010-12-202-47/+47
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-211-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix the redirection of painting for the toolbar.Fabien Freling2010-12-201-4/+4
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-12-2076-217/+727
|\ \ \ \ \
| * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-2011-13/+97
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-2011-13/+97
| | |\ \ \ \ \
| | | * | | | | Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-204-0/+30
| | | * | | | | Update test bitmaps for QDeclarativeImage::svg() autotest on WindowsJoona Petrell2010-12-202-0/+0
| | | * | | | | Don't truncate image:// url strings prematurelyBea Lam2010-12-203-12/+62
| | | * | | | | Update docs on importing javascript filesBea Lam2010-12-202-1/+5
| | |/ / / / /
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-2065-204/+630
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-201-1/+1
| | |\ \ \ \
| | | * | | | Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-201-0/+3
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Quiet unused parameter warnings.Aaron McCarthy2010-12-201-0/+3
| | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-181-1/+7
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-181-1/+7
| | | |\ \ \ \ | | |/ / / / /
| | | * | | | Use relative include instead of absolute in default qmake.confMiikka Heikkinen2010-12-171-1/+7
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-171-1/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-1712-36/+120
| | | |\ \ \ \ \
| | | * | | | | | Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-175-12/+10
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Fix QDeclarativeState::reset() autotestJoona Petrell2010-12-173-12/+10
| | | * | | | | | Update test bitmaps for QDeclarativeImage::svg() autotest on LinuxJoona Petrell2010-12-172-0/+0
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-171-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix incorrect file name case for OpenGL libraries in symbian.conf.Miikka Heikkinen2010-12-171-4/+4
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-174-1/+8
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-164-1/+8
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-164-1/+8
| | | | | |_|/ / / / | | | | |/| | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-171-1/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-161-1/+4
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| | | |/ / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-163-2/+48
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Improved orientation change autotestMiikka Heikkinen2010-12-162-0/+44
| | | * | | | | Avoid duplicate resize eventMiikka Heikkinen2010-12-161-2/+4
| | | |/ / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-167-32/+67
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-159-34/+118
| | | |\ \ \ \