summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-319-42/+222
|\
| * Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-311-2/+0
| |\
| * | Doc: Updated the qdoc manual with i18n info. Fixed a code example.David Boddie2010-03-302-18/+90
| * | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-301-17/+16
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-307-24/+132
| |\ \ \
| | * | | Define QT_NO_EGL in configure.exeTom Cooksey2010-03-261-0/+4
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-266-24/+128
| | |\ \ \
| | | * | | cetest: remove source file duplicates from cetest.proJoerg Bornemann2010-03-261-2/+0
| | | * | | Paintbuffer single frame profiling.Samuel Rødal2010-03-261-9/+90
| | | * | | Fix bad mergeOlivier Goffart2010-03-251-15/+7
| | | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-2519-172/+383
| | | |\ \ \
| | | * | | | Fix warnings and build on mingwThierry Bastian2010-03-252-5/+5
| | | * | | | cetest build fixJoerg Bornemann2010-03-251-1/+2
| | | * | | | cetest build fix for TCP sync connectionJoerg Bornemann2010-03-252-0/+24
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-315-11/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Minor cleanup for visual test framework.Michael Brasser2010-03-315-11/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-311-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | no need for CONFIG += ordered hereOswald Buddenhagen2010-03-301-2/+0
* | | | | | Fix viewer resizing on reload and File->openMartin Jones2010-03-301-17/+16
| |/ / / / |/| | | |
* | | | | Simplify import path.Warwick Allison2010-03-291-2/+9
| |/ / / |/| | |
* | | | Designer: Fix broken resource view filtering.Friedemann Kleint2010-03-261-1/+1
| |_|/ |/| |
* | | Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-252-35/+28
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-243-14/+19
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-238-101/+420
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-222-35/+28
| |\ \ \ \
| | * | | | Deprecate inline Script {} blocksAaron Kennedy2010-03-221-30/+28
| | * | | | Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-5/+0
* | | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-243-14/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-233-14/+19
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-233-14/+19
| | |/ / /
* | | | | Redesigned object and class labels for the Designer propertyeditorJens Bache-Wiig2010-03-242-12/+60
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-2317-157/+312
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-235-20/+59
| |\ \ \ \
| | * | | | Use standard theme icons in Linguist where possibleThorbjørn Lindeijer2010-03-231-11/+33
| | * | | | Use more standard icons from the theme in AssistantThorbjørn Lindeijer2010-03-232-6/+15
| | * | | | Use more standard icons for standard actions in DesignerThorbjørn Lindeijer2010-03-232-3/+11
| * | | | | Possible fix for missing QML properties in the qt.qhp file.Martin Smith2010-03-234-23/+126
| |/ / / /
| * | | | Designer: Fix broken resource view.Friedemann Kleint2010-03-231-1/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-227-113/+125
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-217-113/+125
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-197-113/+125
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-192-5/+3
| | | | |\ \
| | | | * | | Dont force height for filter widgetJens Bache-Wiig2010-03-181-7/+0
| | | | * | | Redesigned filter widgetsJens Bache-Wiig2010-03-184-100/+116
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-171-1/+4
| | | | |\ \ \
| | | | | * | | Use a toolbar for the designer property editorJens Bache-Wiig2010-03-171-1/+4
| | | | * | | | qdoc3: Fixed some ifdef typos and removed some whitespace.Martin Smith2010-03-172-10/+10
| | | | |/ / /
* | | | | | | Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6cShane Kearns2010-03-226-77/+384
* | | | | | | Enable installation of a sis file without running any applicationShane Kearns2010-03-221-22/+27
* | | | | | | Replace download % display with a progress barShane Kearns2010-03-221-2/+9
|/ / / / / /