summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Removed compilation warning for systems with no OpenGL supportLasse Holmstedt2010-07-011-0/+2
* Remove qmlviewer dependency on QDeclarativeTimerMartin Jones2010-07-013-21/+23
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0115-228/+970
|\
| * Indicate default sizing option in qmlviewerBea Lam2010-06-301-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2914-227/+969
| |\
| | * update qml.qch to version 4.7mae2010-06-291-2/+2
| | * Fix so window will resize with the root object (broken byBea Lam2010-06-291-0/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2913-225/+966
| | |\
| | | * Adapt all qmlviewer testcases to the code changes in the actual viewer.Robert Griebl2010-06-283-15/+4
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2814-225/+977
| | | |\
| | | | * Stop QMLLauncher from crashing on exit on Mac when quitting app via theBea Lam2010-06-282-0/+14
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-06-288-86/+287
| | | | |\
| | | | * | forget to rename the moc include when renaming deviceorientation_maemo.cppRobert Griebl2010-06-251-1/+1
| | | | * | fix namespace macrosRobert Griebl2010-06-251-1/+3
| | | | * | fix QML Viewer resize modesRobert Griebl2010-06-252-5/+8
| | | | * | forgot to cleanup the code a bit after adding Maemo5 supportRobert Griebl2010-06-253-19/+10
| | | | * | Make the QML viewer usable on the N900Robert Griebl2010-06-2513-199/+909
| | | | * | Make compile.Michael Brasser2010-06-241-1/+1
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-241-26/+58
| | | | |\ \
| | | | | * | Update lupdate to recognize concatenated text in QML files.Michael Brasser2010-06-241-16/+56
| | | | | * | Support for non-literal plural arguments to qsTr() in lupdate (QML).Michael Brasser2010-06-231-12/+4
* | | | | | | Reformat whitespace according to coding styleMark Brand2010-06-301-596/+596
|/ / / / / /
* | | | | | warn about stray meta dataOswald Buddenhagen2010-06-291-4/+7
* | | | | | don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-291-0/+3
* | | | | | fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
|/ / / / /
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-289-77/+131
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2812-88/+306
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-2523-373/+563
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-236-20/+173
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ...David Boddie2010-06-187-88/+313
| |\ \ \ \ \ \ \
| * | | | | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
* | | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-281-0/+8
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fixed copy-paste error in htmlgenerator.cppRohan McGovern2010-06-261-1/+1
* | | | | | | Doc: fixing search bugMorten Engvoldsen2010-06-252-3/+15
* | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-252-8/+66
* | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-255-2/+16
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| * | | | | | Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| | |_|_|/ / | |/| | | |
| * | | | | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-231-0/+5
| | |_|_|/ | |/| | |
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-255-76/+207
|/ / / /
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-221-0/+4
|\ \ \ \
| * | | | Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-223-8/+71
|/ / / /
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-1/+45
* | | | Finish merge conflict.Martin Smith2010-06-2215-284/+129
|\ \ \ \
| * | | | qdoc3: Build fix for regression in f321a3f2b1eAndreas Kling2010-06-222-4/+4
| * | | | qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-223-6/+5
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-218-42/+168
| |\ \ \