summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1816-16/+151
|\
| * Updated WebKit to cacbdf18fc917122834042d77a9164a490aafde4Simon Hausmann2010-05-184-6/+18
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1816-16/+139
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1716-16/+139
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-1716-16/+139
| | | |\
| | | | * Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341dSimon Hausmann2010-05-167-8/+61
| | | | * Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372aSimon Hausmann2010-05-1513-10/+80
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-184-69/+60
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-174-69/+60
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Compile with Gcc 4.1Olivier Goffart2010-05-171-0/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-174-69/+59
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Optimized pixmapcache key generation for icons and stylesOlivier Goffart2010-05-174-69/+59
| | | |/ /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-182-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | qmake/MinGw: Link statically.Friedemann Kleint2010-05-182-2/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-179-10/+32
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Fix a small typo in assistant manual: hompage -> homepageLaszlo Papp2010-05-171-1/+1
| * | | Print icon in doc pages has no effect.kh12010-05-173-0/+3
| * | | Assistant has unnecessary repaints when expand/collapse selected node.kh12010-05-171-7/+11
| * | | Compile fixes.ck2010-05-173-0/+5
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-171-2/+12
| |\ \ \ |/ / / /
| * | | Changelog: Added Designer/uic3 changes for 4.7.0.Friedemann Kleint2010-05-171-2/+12
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-17429-673/+1254
|\ \ \ \ | |_|/ / |/| | |
| * | | Move xmldata example into rssnews demo.Yann Bodson2010-05-1711-146/+218
| * | | Move Q_ENUMS to start of class declarationAaron Kennedy2010-05-172-3/+3
| * | | Restructure QDeclarativeAbstractBinding destructorAaron Kennedy2010-05-171-2/+4
| * | | Don't call pure virtual method in ~QDeclarativeAbstractBinding()Aaron Kennedy2010-05-171-1/+1
| * | | Fix examples autotest when compiled without webkit or xmlpatternsBea Lam2010-05-171-2/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-17100-958/+2482
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-17416-535/+980
| | |\ \ \ | |/ / / / |/| | | |
| | * | | Focus should be applied to focus scopes all the way up the chain, notBea Lam2010-05-172-6/+2
| | * | | Add focus docs snippetsBea Lam2010-05-172-22/+28
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1714-88/+432
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-17401-429/+495
| | | |\ \ \
| | | * | | | Don't crash due to recursive positioning.Martin Jones2010-05-173-27/+65
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-16306-3218/+6499
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-146-16/+18
| | | |\ \ \ \ \
| | | * | | | | | Add a "priority" property to Keys and KeyNavigationMartin Jones2010-05-149-46/+361
| | * | | | | | | Fix doc for status, add Image::onLoaded.Warwick Allison2010-05-173-5/+29
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1744-590/+1020
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Empty commit to trigger a rebuild in the CI systemThiago Macieira2010-05-160-0/+0
| * | | | | | | Use case-insensitive comparison for the "data" scheme in URLsThiago Macieira2010-05-151-1/+1
| * | | | | | | tst_bic: Fix building on Mac 64Thiago Macieira2010-05-151-1/+1
| * | | | | | | Fix building of tst_QTcpSocketThiago Macieira2010-05-151-2/+2
| * | | | | | | Autotest: some improvements to timeout testing of tst_QTcpSocketThiago Macieira2010-05-151-4/+22
| * | | | | | | Revert "Optimized pixmapcache key generation for icons and styles"Thiago Macieira2010-05-153-48/+65
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1544-649/+1044
| |\ \ \ \ \ \ \ |/ / / / / / / /
| * | | | | | | Revert "More improvements to pixmap cache key generation"Thiago Macieira2010-05-144-57/+50
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1445-653/+1055
| |\ \ \ \ \ \ \
| | * | | | | | | More improvements to pixmap cache key generationJens Bache-Wiig2010-05-144-50/+57
| | * | | | | | | More 4.7 stuff.Trond Kjernåsen2010-05-141-0/+3