summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* fix buildRitt Konstantin2011-07-141-10/+2
* get rid of unwanted dependencies and unused header includesRitt Konstantin2011-07-143-26/+6
* sync qws_dataDir() with coreapp's internal qws_dataDir()Ritt Konstantin2011-07-141-6/+19
* Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-086-35/+79
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-07-052-24/+62
| |\
| | * qmlplugindump: Fix dumping with -path on Mac.Christian Kamm2011-06-291-2/+10
| | * qmlplugindump: Improve error message for misbehaving plugin components.Christian Kamm2011-06-291-2/+8
| | * qmldump: Fix export comparison.Christian Kamm2011-06-271-1/+1
| | * qmlplugindump: For extended types, remove exports of the base object.Christian Kamm2011-06-231-20/+27
| | * qmlplugindump: Build debug version if possible.Christian Kamm2011-06-231-0/+17
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-042-9/+15
| |\ \
| | * | runonphone: Change the upload option to allow uploading any fileMartin Storsjo2011-06-241-7/+7
| | * | runonphone: Include the manufacturer name in the friendly name on OS XMartin Storsjo2011-06-241-1/+2
| | * | runonphone: Fix usb device enumeration on Mac OS XMartin Storsjo2011-06-241-1/+6
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-07-021-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-291-1/+1
| | |\ \ \
| | | * \ \ Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-231-23/+40
| | | |\ \ \ | | | | |/ /
| | | * | | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-2237-2905/+5147
| | | |\ \ \
| | | * | | | Fix configure after new import of WebKit.Alexis Menard2011-05-311-1/+1
| * | | | | | Doc: Fixing typoSergio Ahumada2011-06-301-1/+1
| |/ / / / /
* | | | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-07-019-202/+174
* | | | | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-0/+6
|/ / / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-06-271-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5Simo Fält2011-06-171-2/+4
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-221-23/+40
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | qmlplugindump: Add -v option.Christian Kamm2011-06-211-23/+40
| * | | qmlplugindump: Fix emitted tooling version.Christian Kamm2011-06-211-2/+2
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1725-2628/+4868
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-101-1/+0
| |\ \ \
| | * | | fix build on windows 7Oswald Buddenhagen2011-06-101-1/+0
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-091-6/+16
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | qmlplugindump: Bump QtQuick.tooling version to 1.1.Christian Kamm2011-05-301-1/+1
| | * | | qmlplugindump: Dump revision property.Christian Kamm2011-05-301-0/+9
| | * | | qmlplugindump: Fix --path usage with drive letters on Windows.Christian Kamm2011-05-301-5/+6
| | | |/ | | |/|
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-091-2/+9
| |\ \ \
| | * | | Fix compilation of qtconfig without X11Olivier Goffart2011-06-081-2/+9
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-0822-2610/+4817
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | "fix" license headersOswald Buddenhagen2011-06-029-126/+207
| | * | | need no qlibraryinfo any moreOswald Buddenhagen2011-06-012-21/+0
| | * | | remove dead variablesOswald Buddenhagen2011-06-011-17/+3
| | * | | optimization: avoid creating unnecessary temporariesOswald Buddenhagen2011-06-011-35/+29
| | * | | add hash-based indexing to Translator for fast find()Oswald Buddenhagen2011-06-012-26/+92
| | * | | remove Translator::translatedMessages()Oswald Buddenhagen2011-06-013-13/+1
| | * | | remove Translator::contains()Oswald Buddenhagen2011-06-013-10/+1
| | * | | optimization: make the Translator::find() api index-basedOswald Buddenhagen2011-06-013-35/+38
| | * | | fix misnomer: MainWindow::closePhraseBooks() => maybeSavePhraseBooks()Oswald Buddenhagen2011-06-012-3/+3
| | * | | nuke Translator::release(), make saveQM() non-static insteadOswald Buddenhagen2011-06-015-14/+5
| | * | | synchronize qmake project parser with qt creatorOswald Buddenhagen2011-06-0114-2580/+4708
| | |/ /
| * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-061-1/+14
| |\ \ \ | | |/ / | |/| |
| | * | Update Japanese translations.Takumi ASAKI2011-06-061-1/+14