summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Rename File > Quit to Exit on Windows.Thiago Macieira2010-11-281-3/+9
* Merge remote branch 'qt/master'Jason McDonald2010-11-269-5/+196
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-2522-103/+342
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2423-130/+178
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2423-130/+178
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1923-130/+178
| | | | |\
| | * | | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-241-1/+1
| | |\ \ \ \
| | | * | | | Prevent compilers optimizing eval timebomb code out of existence.Jason McDonald2010-11-241-1/+1
| | | | |/ / | | | |/| |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-241-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Prevent crash when calling reload() from within a .qmlDamian Jansen2010-11-231-1/+1
| | | |/ /
| | * | | Dynamically register the event number.Michael Dominic K2010-11-222-6/+18
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-196-3/+173
| | |\ \
| | | * | Documentation update for new switching events.Michael Dominic K2010-11-172-1/+31
| | | * | Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.Michael Dominic K2010-11-174-2/+142
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-171-1/+1
| | | |\ \
| | | | * | Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| | * | | | Allow testing of raster engine on Mac from qmlviewerAaron Kennedy2010-11-191-0/+9
| | |/ / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-2216-107/+154
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote branch 'qt/master'Jason McDonald2010-11-221-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-11-1921-130/+195
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-197-27/+63
| | * | | | Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-182-0/+12
| | * | | | Make epocroot resolving compatible with more build environmentsMiikka Heikkinen2010-11-182-57/+51
| | * | | | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-186-25/+42
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Use include(original mkspec) instead of copying of mkspec to defaultMiikka Heikkinen2010-11-161-8/+10
| | * | | | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-0/+4
| | * | | | Bump Qt version to 4.7.2.Jason McDonald2010-11-1213-41/+41
* | | | | | Make lupdate recognize TRANSLATOR comments in QtScript filesKent Hansen2010-11-222-12/+92
| |_|_|/ / |/| | | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-196-24/+42
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Record images on more than just the first frame.Alan Alpert2010-11-161-1/+1
| * | | Turn off font antialiasing during tests.Alan Alpert2010-11-161-10/+9
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-151-1/+6
| |\ \
| | * | Take snapshots starting from the first frameAlan Alpert2010-11-151-1/+6
| | |/
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-119-12/+282
| |\ \ | | |/
| * | qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-113-10/+20
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-117-10/+10
| |\ \
| * | | qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-112-4/+7
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1218-59/+518
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-118-11/+282
| |\ \ \
| | * | | Helper-side support for QMeeGoFenceSync.Michael Dominic K2010-11-118-11/+282
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-111-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | remove pointless assignment of deprecated variableOswald Buddenhagen2010-11-101-1/+0
| | |/
| * | Doc: Fixing typoSergio Ahumada2010-11-093-4/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-085-7/+7
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-055-7/+7
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-035-7/+7
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-035-7/+7
| | | | |\
| | | | | * Doc: Fixing typoSergio Ahumada2010-11-015-7/+7
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-051-2/+2
| |\ \ \ \ \
| | * | | | | Doc: adding html clasnames to the next and previous linksMorten Engvoldsen2010-11-041-2/+2
| | |/ / / /