summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-311-1/+1
|\
| * Fix compilation with stricts compilers.Olivier Goffart2010-05-311-1/+1
* | Doc: replacing old imageMorten Engvoldsen2010-05-311-0/+0
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-283-52/+58
|\
| * fix & unify path separator escapingOswald Buddenhagen2010-05-272-49/+58
| * Remove superfluous forward declaration.kh12010-05-271-3/+0
* | qdoc: Fixed the model/view programming page; tried a style change.Martin Smith2010-05-282-12/+3
|/
* Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-271-1/+3
|\
| * Fix for qml reloaded in qml viewer not being maximized properly on a deviceJoona Petrell2010-05-261-1/+3
* | escape backslashesOswald Buddenhagen2010-05-261-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2513-134/+106
|\ \ | |/ |/|
| * Doc: Fixing bugs in HTML generatorMorten Engvoldsen2010-05-251-4/+4
| * qdoc: Improved class index page.Martin Smith2010-05-251-104/+89
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2413-40/+27
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2413-40/+27
| | |\
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-211-2/+2
| | | |\
| | | | * qdoc: Fixed html error, but the problem is still there.Martin Smith2010-05-211-1/+1
| | | | * qdoc: Changed number of columns to 1. Oila!Martin Smith2010-05-211-1/+1
| | | * | Doc: design changesMorten Engvoldsen2010-05-211-7/+0
| | | |/
| | | * Doc: Changes to the HTMLGenerator, style and jsMorten Engvoldsen2010-05-2112-11/+20
| | | * use qtPrepareTool for qdocOswald Buddenhagen2010-05-201-14/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-2036-1047/+72
| | | |\
| | | | * Doc: Updating CSS and JSMorten Engvoldsen2010-05-201-8/+6
| | | * | qdoc: Propagate the language information into the XML as before.David Boddie2010-05-201-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-251-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Get rid of 'noise' when using GL and the top-level item is an Item.Michael Brasser2010-05-241-1/+2
| |/ / /
* | | | Remove old symbian specific IAP initialization.Martin Jones2010-05-253-32/+0
|/ / /
* | | Fix FolderListModel parentFolder property's file drive handlingJoona Petrell2010-05-211-0/+1
* | | Add license headers for .qml files.Jason McDonald2010-05-211-0/+41
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-198-576/+29
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-198-576/+29
| |\ \
| | * | Rename qml executable to qmlviewerKai Koehne2010-05-192-2/+4
| | * | Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-185-18/+18
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-186-556/+7
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-181-1/+5
| | | |\ \
| | | | * | Set raster + gl viewport as the default for OS X.Michael Brasser2010-05-181-1/+5
| | | * | | Move stuff from QML viewer to plugins.Warwick Allison2010-05-175-555/+1
| | | * | | Fix to work with file: URLs (eg. from qml -qmlbrowser)Warwick Allison2010-05-171-0/+1
| | | |/ /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1935-434/+48
|\ \ \ \ \
| * \ \ \ \ Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-191-28/+1
| |\ \ \ \ \ | | |/ / / /
| * | | | | qdoc: Set back to 3 cols for class list; we have a scrollbar now.Martin Smith2010-05-191-1/+1
| * | | | | Remove obsolete and broken qvfb skins.Jason McDonald2010-05-1924-430/+1
| | |_|_|/ | |/| | |
| * | | | Fix cosmetic issue in designer filter editsJens Bache-Wiig2010-05-181-1/+1
| * | | | Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-1810-2/+45
| | |/ / | |/| |
* | | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-191-28/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-1838-1198/+1223
| |\ \ \ | | |/ /
| * | | Removed mediaservices.Kurt Korbatits2010-05-181-28/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-182-4/+34
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge commit 'qt/4.7' into 4.7Miikka Heikkinen2010-05-179-291/+30
| |\ \ \ | | | |/ | | |/|
| * | | Shadow building on Symbian fixes: part 2 - populate bin dir correctlyIain2010-05-141-1/+28