summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-191-1/+1
|\
| * Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-191-7/+20
| |\
| * \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-1464-1694/+6009
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-2425-318/+494
| |\ \ \
| * | | | Adding -qpa configure switchJørgen Lind2010-06-241-1/+1
| * | | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-18116-2763/+8461
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-1041-495/+1124
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-21113-1204/+4340
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-1820-82/+186
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-1150-196/+592
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-01289-12776/+24894
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-10154-5722/+1656
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141231-3082/+7246
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-1983-926/+1491
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' into lighthousePaul Olav Tvete2009-10-1431-345/+656
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' into lighthousePaul Olav Tvete2009-09-301205-5328/+5888
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Please welcome the Lighthouse Research Project!Paul Olav Tvete2009-09-071-1/+1
* | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-1552-925/+4903
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix for looping crash log on data abortShane Kearns2010-07-151-7/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Only support portrait and landscape orientations on Symbian when updating the...Joona Petrell2010-07-133-18/+6
| * | | | | | | | | | | | | | Calling setMinimumSize(0, 0) on a top-level window sometimes triggers a bugRobert Griebl2010-07-122-36/+28
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-107-55/+267
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Replace 4.6 in all .qdocconf filesKai Koehne2010-07-092-8/+8
| | * | | | | | | | | | | | | | Fix Symbian buildJoona Petrell2010-07-081-0/+2
| | * | | | | | | | | | | | | | Add Symbian support for runtime.orientation propertyJoona Petrell2010-07-074-0/+183
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-072-47/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Prevent a recursive debug output loop when writing to the logger widget.Robert Griebl2010-07-061-4/+11
| | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-052-43/+63
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-042-43/+63
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Don't write to the logger widget while the application is closing down.Robert Griebl2010-07-021-1/+1
| | | | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-021-42/+62
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-023-26/+30
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | qmlviewer: Update the proxy factory when the user changes the proxy.Martin Jones2010-07-021-42/+62
| * | | | | | | | | | | | | | | | | | | | Linux runonphone - tell the user which driver to loadShane Kearns2010-07-091-6/+45
| * | | | | | | | | | | | | | | | | | | | Fix USB serial port detection of the Nokia N95 on linuxShane Kearns2010-07-094-9/+59
| * | | | | | | | | | | | | | | | | | | | Fix license headers on new files imported from Qt CreatorShane Kearns2010-07-096-84/+156
| * | | | | | | | | | | | | | | | | | | | Implement just in time debug feature for runonphoneShane Kearns2010-07-083-3/+186
| * | | | | | | | | | | | | | | | | | | | Merge tools/runonphone/symbianutils from qtcreator src/shared/symbianutilsShane Kearns2010-07-0813-54/+2980
| |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-061-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| * | | | | | | | | | | | | | | | | | | qdoc: Simplified code to enable fixing of QTBUG-6340.Martin Smith2010-07-063-410/+89
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Doc: fixing search script and styleMorten Engvoldsen2010-07-051-1/+1
| * | | | | | | | | | | | | | | | | | qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-07-031-1/+2
| * | | | | | | | | | | | | | | | | Fix Windows buildMark Brand2010-07-031-4/+4
| * | | | | | | | | | | | | | | | | Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-021-42/+27
| * | | | | | | | | | | | | | | | | Split image handler plugin project filesMark Brand2010-07-021-1/+1
| * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-0225-886/+1646
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-024-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Designer: Fix compiler warnings.Friedemann Kleint2010-07-024-3/+8
| | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |