summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Perl check for windows configure.Markku Heikkila2011-09-071-11/+15
| | * | | | | | QSettings: don't assume XDG_CONFIG_HOME is latin1-encodedKonstantin Ritt2011-09-071-2/+2
| | * | | | | | QSettings: use the common appdata dir when bootstrapping qmake on winKonstantin Ritt2011-09-071-8/+2
| | * | | | | | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-0717-111/+73
* | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-085-2/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-085-2/+62
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-075-2/+62
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-075-2/+62
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| | | | * | | | | | | Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-062-1/+47
| | | | * | | | | | | Fix leak in State element.Michael Brasser2011-09-021-0/+12
| | | | * | | | | | | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
* | | | | | | | | | | Implement QAccessibleActionInterface for menu actions.Frederik Gladhorn2011-09-082-8/+83
* | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-0738-84/+415
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-0712-7/+51
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | fix build for desktopKonstantin Ritt2011-09-072-2/+13
| | * | | | | | | | | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-0610-5/+38
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-0726-77/+364
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-0626-77/+364
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-09-0626-77/+364
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)Ademar de Souza Reis Jr2011-09-0626-77/+364
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-teamJan-Arve Saether2011-09-07831-9800/+33440
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-09-069-8/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-067-6/+65
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-067-6/+65
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | _ / / / / / / / / / / | | | | / / / / / / / / / /
| | | * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-09-05315-4753/+20941
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4Ademar de Souza Reis Jr2011-08-307-6/+65
| | * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-052-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-09-052-2/+1
| * | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-0349-302/+583
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-0342-100/+415
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-0313-63/+521
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-09-039-202/+168
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-09-029-202/+168
| | | * | | | | | | | | | | | Merge remote-tracking branch 'origin/4.8'Liang Qi2011-09-0238-112/+353
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-09-0211-25/+521
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-01610-6034/+13579
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-292-4/+77
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-2899-966/+1249
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-023-8/+12
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|/ / / / / / / | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-021-4/+4
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | URLs used with scheme handler use appropriate encoding for schememread2011-09-011-4/+4
| | | | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-022-4/+8
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|/ / / / / / | | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | Revert readonly BorderImage::sourceSize changeMartin Jones2011-09-012-4/+8
| | | | | | | | | * | | | | | | | | | | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-0128-88/+491
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-09-017-13/+18
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / / / / /
| | | | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-010-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / / / / /
| | | | | | | | | | | * | | | | | | | | | Fix memory leak in ListModel custom parserBea Lam2011-09-011-0/+1
| | | | | | | | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-317-13/+18
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / / / / | | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | DEF file updateGareth Stockwell2011-08-312-2/+2