summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix typo in docs.Aaron McCarthy2010-07-271-1/+1
* Cherry pick fix for MOBILITY-1145 from Qt Mobility.Aaron McCarthy2010-07-271-1/+3
* Cherry pick fix for MOBILITY-1144 from Qt Mobility.Aaron McCarthy2010-07-271-2/+15
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-252-1/+26
|\
| * Drawer widget in a MainWindow disappears after returning from full screen mode.Carlos Manuel Duclos Vergara2010-07-232-1/+26
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-251-1/+1
|\ \ | |/ |/|
| * Dummy commit to make the CI test againSimon Hausmann2010-07-250-0/+0
| * Fix quoting for module reading in qconfig.priSimon Hausmann2010-07-241-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-232-27/+26
|\
| * qdoc: Cleaned up the TOC for QML element pages.Martin Smith2010-07-231-5/+11
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-2310-183/+558
| |\
| * | qdoc: Cleaned up the Inherits and Inherited by lines for QML elements.Martin Smith2010-07-231-22/+14
| * | doc: Added missing \since 4.7 to effect propertyu.Martin Smith2010-07-231-0/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-23101-788/+2008
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-23101-788/+2008
| |\ \ \
| | * | | Update QtDeclarative def filesJoona Petrell2010-07-232-6/+8
| | * | | Fix crash in MouseAreaJoona Petrell2010-07-231-1/+2
| | * | | CompileAaron Kennedy2010-07-231-6/+3
| | * | | Fixes undeleted timers (and endless warning from the event loop aboutAaron Kennedy2010-07-231-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-2364-175/+483
| | |\ \ \
| | | * | | Remove unneeded member variable.Michael Brasser2010-07-222-6/+3
| | | * | | Fix test.Michael Brasser2010-07-221-0/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2295-754/+1935
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2295-754/+1935
| | | | |\ \ \
| | | | | * | | Fix TextInput echoMode autotest on LinuxJoona Petrell2010-07-221-0/+4
| | * | | | | | Generalize qml "registration"Aaron Kennedy2010-07-226-21/+64
| | * | | | | | Fix compiler warningAaron Kennedy2010-07-221-2/+0
| | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-2219-37/+326
| | |\ \ \ \ \
| | | * | | | | Fix TextEdit text attribute and text stored in the internal QTextDocument hav...Joona Petrell2010-07-222-2/+37
| | | * | | | | Remove QDeclarativeItem::childrenChanged() signal overloadMartin Jones2010-07-224-3/+7
| | | * | | | | Update QtGui and QtDeclarative def filesJoona Petrell2010-07-224-12/+33
| | | * | | | | Make rootContext and engine pointers in QDeclarativeView API constJoona Petrell2010-07-224-14/+15
| | | * | | | | Add additional QVariant benchmarks.Michael Brasser2010-07-221-0/+45
| | | * | | | | Allow MouseArea dragging to filter mouse events from descendantsMartin Jones2010-07-226-6/+189
| | * | | | | | Reuse QML lexer to simplify .pragma script logicAaron Kennedy2010-07-222-67/+42
| | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2180-650/+1563
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2180-650/+1563
| | | |\ \ \ \ \
| | | | * | | | | Expand QDeclarativeExtensionPlugin docsBea Lam2010-07-213-13/+73
| | | | * | | | | Add missing snippet filesBea Lam2010-07-212-0/+139
| | | | * | | | | Expand QtObject docBea Lam2010-07-212-7/+95
| | | | * | | | | Indicate default valuesBea Lam2010-07-212-8/+26
| | | | * | | | | Use snippets instead to avoid quoting license headersBea Lam2010-07-211-0/+1
| | | | * | | | | Rename remaining 'wantsFocus'.Yann Bodson2010-07-213-10/+10
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-211-0/+12
| | | | |\ \ \ \ \
| | | | | * | | | | Add QML tutorials to the tutorials pageAlan Alpert2010-07-211-0/+12
| | | | * | | | | | Bounding rect of text was not always calculated correctly.Martin Jones2010-07-213-53/+64
| | | | |/ / / / /
| | | | * | | | | QML focus API updates.Michael Brasser2010-07-2132-246/+330
| | | | * | | | | Do not show copyright header in documentation.Yann Bodson2010-07-212-1/+3
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-2115-22/+142
| | | | |\ \ \ \ \
| | | | | * | | | | Only ignore the same target value for a Behavior when it is running.Michael Brasser2010-07-213-1/+45