summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / / /
* | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-222-1/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | WhitespaceThomas Zander2010-03-194-38/+38
| * | | | Made runonphone flush all application output.axis2010-03-181-1/+1
| * | | | Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-0/+6
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-195-42/+112
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use libusb to auto-detect the port to use to communicate with the phoneThomas Zander2010-03-193-15/+85
| * | | | WhitespaceThomas Zander2010-03-194-38/+38
| | |_|/ | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-192-5/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-172-5/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-162-1/+2
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1155-211/+624
| | |\ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0145-319/+478
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2386-3322/+1719
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1986-167/+9926
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1826-950/+1528
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16214-11500/+14692
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-1633-238/+875
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-12145-5707/+1398
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Fix linking for armlinkThomas Zander2010-02-042-5/+3
generated by cgit v0.12 at 2024-11-15 17:26:35 (GMT)