summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Correctly support translation in QDeclarativePixmapCacheWarwick Allison2010-04-162-5/+7
* | Avoid calling QGraphicsItem::setTransformOriginPoint() until neededMartin Jones2010-04-164-5/+36
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-16102-722/+1366
|\
| * Correctly support translation in QDeclarativeCompilerAaron Kennedy2010-04-152-8/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-15144-2302/+1724
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-15144-2302/+1724
| | |\
| | | * Small calculator fix.Yann Bodson2010-04-152-10/+10
| | | * Improve declarative calculator example.Yann Bodson2010-04-1513-227/+238
| | | * Update examples autotest to use the runtime directlyAaron Kennedy2010-04-154-96/+42
| | | * Support valuetypes as method return valuesAaron Kennedy2010-04-159-41/+133
| | | * Compile without Qt3 support.Yann Bodson2010-04-151-1/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-151-0/+20
| | | |\
| | | | * DocAaron Kennedy2010-04-151-0/+20
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1518-104/+178
| | | |\ \ | | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1556-1467/+327
| | | | |\
| | | | * | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1517-99/+171
| | | | * | CommentsAaron Kennedy2010-04-151-1/+3
| | | | * | Remove unused parameterAaron Kennedy2010-04-153-4/+4
| | | * | | Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-153-13/+10
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1524-1436/+130
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-1511-44/+101
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1524-124/+296
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | QListView: Re-fix scrollbar rangesGabriel de Dietrich2010-04-152-4/+40
| | * | | | Fix compile error with QT_NO_GRAPHICSVIEW in QtMultimediaTasuku Suzuki2010-04-153-1/+23
| | * | | | Fix compile error with QT_NO_IMAGEFORMAT_XPM in QtGuiTasuku Suzuki2010-04-152-0/+4
| | * | | | Wrap EGL image function pointers and move into QEgl namespaceTom Cooksey2010-04-154-32/+49
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1515-87/+180
| | |\ \ \ \
| | | * | | | Fix compilation of ShivaVG, which does not have EGL.Rhys Weatherley2010-04-151-0/+2