summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * qdoc: Don't generate html output for png files.Martin Smith2010-10-071-2/+2
| | | * Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cppMorten Engvoldsen2010-10-071-2/+2
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-072-0/+166
| | |\ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0410-5/+19
| | |\ \
| | * | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-0411-55/+55
| | * | | Doc: Removed a superfluous comment.David Boddie2010-10-041-1/+0
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-3024-111/+160
| | |\ \ \
| | * | | | Doc: Fixed non-well-formed table output.David Boddie2010-09-241-1/+1
| | * | | | Doc: Fixed coding style breakage in qdoc source code.David Boddie2010-09-231-65/+64
* | | | | | Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
|/ / / / /
* | | | | 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
| | * | | Fixed some code style issues in qtconfigBoris Moiseev2010-10-061-26/+3
| | * | | Refactored the MainWindow in qtconfigBoris Moiseev2010-10-067-696/+235
| | * | | Refactored PaletteEditorAdvanced in qtconfigBoris Moiseev2010-10-068-1244/+623
| | * | | Removed more legacy code from qtconfig and fixed codestyle issuesBoris Moiseev2010-10-064-18/+17
| | * | | Refactored PreviewWidget in qtconfigBoris Moiseev2010-10-068-513/+285
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-072-0/+166
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Support device orientation in harmattanMartin Jones2010-10-072-0/+166
| |/ / /
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-015-4/+8
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-305-4/+8
| |\ \ \
| | * | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-293-3/+3
| | * | | Register QtQuick 1.0 module.Aaron Kennedy2010-09-291-0/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-281-1/+4
| | |\ \ \
| | | * | | QmlViewer: Fix typo in commentKai Koehne2010-09-281-1/+1
| | | * | | QmlViewer: Fix assert on exit (Windows)Kai Koehne2010-09-281-0/+3
* | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-305-1/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Don't use translations for console tools under windowsVictor Ostashevsky2010-09-285-1/+11
| |/ / /