summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* qtguiu.def merge conflict fixmread2010-07-022-44/+119
* Fix for include "private/qt_s60_p.h" in non-symbian buildsmread2010-07-011-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0134-138/+540
|\
| * Making orbit input methods work with Qt apps with -no-s60mread2010-07-011-2/+2
| * Using the remaining valid data to construct the QTime object when msec parsin...Liang Qi2010-07-011-1/+1
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-07-0132-129/+521
| |\
| | * fix for broken input method loadingmread2010-07-011-1/+1
| | * Avkon Removal DEF file updatesmread2010-07-012-2/+46
| | * Stub version of QS60Stylemread2010-07-013-6/+137
| | * Avkon removal configured with -no-s60mread2010-07-0127-121/+338
| * | QProgressDialog text is too close to dialog borderSami Merila2010-07-011-2/+9
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-07-0115-688/+739
| |\
| * | QFileDialog broken in landscape in N8Sami Merila2010-06-301-6/+9
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-01217-9059/+6970
|\ \ \
| * | | Reseted QtDeclarative module def filesJoona Petrell2010-07-012-7793/+3307
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-011-0/+2
| |\ \ \
| | * | | Removed compilation warning for systems with no OpenGL supportLasse Holmstedt2010-07-011-0/+2
| * | | | Get WebView tests passing againAlan Alpert2010-07-011-2/+0
| * | | | Remove arbitrary width checksAlan Alpert2010-07-011-2/+0
| * | | | Fix bug in SameGame's dialog componentAlan Alpert2010-07-012-1/+3
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-01393-2850/+5894
| |\ \ \ \ | | |/ / /
| | * | | doc fixBea Lam2010-07-011-2/+4
| | * | | Add abstractitemmodel example, and fix some model docsBea Lam2010-07-0112-127/+469
| | * | | docs - quote code with snippets, other improvementsBea Lam2010-07-019-109/+116
| | * | | Fix webkit import for webkit tests.Martin Jones2010-07-017-7/+7
| | * | | Remove qmlviewer dependency on QDeclarativeTimerMartin Jones2010-07-013-21/+23
| | * | | Remove a few more unnecessary exports.Martin Jones2010-07-014-6/+6
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-0112-687/+767
| | |\ \ \
| | | * | | Add additional text layout benchmarks.Michael Brasser2010-07-011-7/+51
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-01155-979/+2978
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | * | | | Don't export declarative private classesMartin Jones2010-07-0135-52/+52
| | | |/ / | | |/| |
| | * | | Don't access uninitialized value.Martin Jones2010-06-301-10/+9
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30155-969/+2969
| | |\ \ \
| | | * | | Added SET_BINDING message to QDeclarative debugger protocolLasse Holmstedt2010-06-305-7/+112
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-301-2/+3
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30148-934/+2800
| | | | |\ \ \
| | | * | | | | Add ListView.nextSection attached propertyMartin Jones2010-06-305-10/+55
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-3028-181/+405
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Docs - add more links to relevant examplesBea Lam2010-06-3024-15/+59
| | | | * | | | Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn'tBea Lam2010-06-303-165/+345
| | | | * | | | Indicate default sizing option in qmlviewerBea Lam2010-06-301-1/+1
| | | * | | | | Remove the old font.outline documentationMartin Jones2010-06-303-18/+2
| | | |/ / / /
| | | * | | | Plug QdeclarativePixmapCache canceled request leak.Martin Jones2010-06-301-27/+29
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-30124-726/+2366
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29124-726/+2366
| | | | |\ \ \
| | | | | * | | update qml.qch to version 4.7mae2010-06-291-2/+2
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29123-724/+2364
| | | | | |\ \ \
| | | | | | * | | Undefined is undefined, and now qml warns about itmae2010-06-291-3/+3
| | | | | | * | | Fix so window will resize with the root object (broken byBea Lam2010-06-291-0/+1
| | | | | | * | | Avoid duplicate code for testing initial sizesBea Lam2010-06-291-21/+15