summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1788-733/+1180
|\
| * Recognize identifiers containing unicode escape sequences.Roberto Raggi2010-04-162-3/+43
| * Fix READMEmae2010-04-161-1/+1
| * Fix doc: QML_DECLARE_TYPE is no longer necessarymae2010-04-162-23/+4
| * Fix doc: remote contents requires qmldirmae2010-04-161-2/+4
| * Fixed parsing of inner labelled statements.Roberto Raggi2010-04-163-7/+7
| * DocAaron Kennedy2010-04-161-2/+2
| * Remove unsupported plugin version flags in .pro files of declarative examplesJoona Petrell2010-04-162-2/+0
| * Documentation typo.Yann Bodson2010-04-161-8/+8
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-162-2/+3
| |\
| | * Ensure existing image is gone before next photo selection.Warwick Allison2010-04-161-0/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1652-538/+836
| | |\
| | * | Don't use zoomfactor.Warwick Allison2010-04-161-2/+2
| * | | More QML doc consistency.Martin Jones2010-04-164-22/+22
| | |/ | |/|
| * | Doc: in QML use "real" and "enumeration", not "qreal" and "enum"Martin Jones2010-04-1612-28/+23
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1643-592/+930
| |\ \
| | * | Wait for debug clients asynchronously instead of blocking creation ofBea Lam2010-04-168-311/+143
| | * | Test not reliableBea Lam2010-04-161-8/+0
| | * | ResizeMode support for QGraphicsWidgets created with QDeclarativeViewJoona Petrell2010-04-1610-132/+551
| | * | More class documentation fixes for declarative.Michael Brasser2010-04-167-32/+77
| | * | Simplify QML import plugin deployment linesJoona Petrell2010-04-165-10/+5
| | * | Add QML imports to s60installs.proJoona Petrell2010-04-161-0/+19
| | * | Cleanup photoviewer demo.Yann Bodson2010-04-163-4/+6
| | |/
| | * clean upWarwick Allison2010-04-161-1/+0
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-169-11/+60
| | |\
| | * | Throw exceptions on programming errors for global functions.Warwick Allison2010-04-169-94/+129
| * | | Doc: Put "default" property label on same line as property nameMartin Jones2010-04-162-10/+9
| * | | Doc: make note about using clip: true in views slightly more prominent.Martin Jones2010-04-163-3/+3
| | |/ | |/|
| * | Add test for QTBUG-9949Martin Jones2010-04-161-0/+17
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-161-3/+3
| |\ \
| | * | Do not set a font pixel size of 0.Yann Bodson2010-04-161-3/+3
| * | | Add parent property to TimerMartin Jones2010-04-161-0/+1
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-169-26/+72
| |\ \
| | * | CleanupAaron Kennedy2010-04-162-3/+3
| | |/
| | * Class documentation fixes for declarative.Michael Brasser2010-04-165-18/+62
| * | Avoid calling QGraphicsItem::setTransformOriginPoint() until neededMartin Jones2010-04-164-5/+36
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-1780-352/+891
|\ \ \
| * | | Fix mismatched import declarationsThiago Macieira2010-04-171-1/+1
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-1680-351/+890
| |\ \ \ |/ / / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-161-1/+4
| |\ \ \
| | * | | DocAaron Kennedy2010-04-161-1/+4
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-154-28/+111
| |\ \ \
| | * | | create magic comment messages in "finished" stateOswald Buddenhagen2010-04-152-3/+8
| | * | | make QT_TR_NOOP work in static initializersOswald Buddenhagen2010-04-153-6/+87
| | * | | make HashString and HashStringList objects smallerOswald Buddenhagen2010-04-151-13/+10
| | * | | remove pointless manual assignments from token type enumOswald Buddenhagen2010-04-151-6/+6
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-1536-46/+78
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-04-155-25/+100
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-1529-41/+40
| | | |\ \ \
| | * | | | | Update EABI and BWINS DEF files for SymbianIain2010-04-155-3/+35