summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-032-4/+34
|\
| * qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| * Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
* | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
* | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
|/
* Fix QML visual tests on Mac.Yann Bodson2010-11-011-0/+8
* Update webview visual tests to new skip modeAlan Alpert2010-10-291-4/+2
* Add 'skip' property that QML visual tests can useAlan Alpert2010-10-294-6/+33
* Doc : Fixing typo.Sergio Ahumada2010-10-266-6/+6
* Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-217-112/+60
* Fix recording of visual tests.Michael Brasser2010-10-191-0/+2
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-181-3/+6
|\
| * Use the real screen size in meegographics surface scaling, not hardcoded one.Michael Dominic K2010-10-181-3/+6
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-163-7/+7
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-154-9/+10
| |\
| | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-1415-126/+125
| | |\
| | * | Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-133-7/+7
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-154-19/+21
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1517-143/+142
| |\ \ \
| | * | | Workaround for QFileSystemWatcher regressionJarek Kobus2010-10-141-3/+3
| | * | | Assistant: Insert all keywords with empty ids, as ids are not mendatory.kh12010-10-121-6/+7
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1115-134/+132
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Make qtconfig help messages translatableVictor Ostashevsky2010-10-111-10/+10
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0814-124/+122
| | | |\ \
| | | | * \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-072-4/+4
| | | | |\ \
| | | | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-072-0/+166
| | | | |\ \ \
| * | | | | | | Keep qmlviewer from disappearingAlan Alpert2010-10-151-0/+1
| |/ / / / / /
* | | | | | | Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-111-5/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
| |/ / / /
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0813-407/+199
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0713-407/+199
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Live texture updates to meegographicssystem helper.Michael Dominic K2010-10-0711-406/+197
| | * | | Revert the integration of the merge request 2286.Benjamin Poulain2010-10-0723-1496/+2798
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0724-2798/+1497
| | |\ \ \
| | | * | | ActiveQt: also make the designer plugin for qaxwidget build in the opensource...Patrick Spendrin2010-10-071-1/+1
| | | * | | Fix compilationOlivier Goffart2010-10-074-8/+9
| | | * | | Code cleaning with the merge request 2286Benjamin Poulain2010-10-065-17/+15
| | | * | | Fix a pending issue with the merge request 2286Benjamin Poulain2010-10-061-6/+1
| | | * | | Fixed the build error in qtconfigBoris Moiseev2010-10-061-1/+1
| | | * | | Resolved a little code style issue in qtconfigBoris Moiseev2010-10-061-1/+3
| | | * | | Renamed controls in qtconfig's MainWindowBoris Moiseev2010-10-062-346/+357
| | | * | | Removed inheritance from UI file in qtconfig's MainWindowBoris2010-10-062-245/+269
| | | * | | Fixed a bug and resolved some translation issues in qtconfigBoris Moiseev2010-10-061-8/+8
| | | * | | Fixed some problems in qtconfig's PreviewWidgetBoris Moiseev2010-10-063-33/+28
| | | * | | Removed the inheritance from ui file in qtconfig's PaletteEditorAdvancedBoris Moiseev2010-10-062-38/+45
| | | * | | Replaced the unnecessary include with declarationBoris Moiseev2010-10-062-2/+2
| | | * | | Resolved some code style issues and fixed the broken copyright yearBoris Moiseev2010-10-065-39/+40
| | | * | | Finally removed the qtconfig dependency from qt3supportBoris Moiseev2010-10-062-2/+1
| | | * | | Modified previewwidget's ui file in qtconfigBoris Moiseev2010-10-061-7/+7