summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2527-261/+215
|\
| * 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
| | | |\
| * | | \ 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
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0813-407/+199
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-072-0/+166
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | 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 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
* | | | | | | | Merge commit '9f766c977a329c84023a15fc66f52d26ff03447b^' into qt-master-from-4.7Olivier Goffart2010-10-253-7/+7
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-133-7/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-229-10/+330
|\ \ \ \ \ \ \
| * | | | | | | Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-229-10/+330
* | | | | | | | Designer: Enable morphing into QTextBrowser.Friedemann Kleint2010-10-191-1/+1
|/ / / / / / /
* | | | | | | removed obsolete -qt-gif configure optionMark Brand2010-10-151-4/+1
* | | | | | | Fix potential crash in case we had opened pages but run now without docs.kh12010-10-131-1/+2
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-111-5/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-081-5/+5
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-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
generated by cgit v0.12 at 2024-11-27 08:22:25 (GMT)