summaryrefslogtreecommitdiffstats
path: root/src
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-1611-22/+22
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1621-252/+387
|\
| * Wait for debug clients asynchronously instead of blocking creation ofBea Lam2010-04-163-85/+57
| * ResizeMode support for QGraphicsWidgets created with QDeclarativeViewJoona Petrell2010-04-162-88/+180
| * 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-168-11/+43
| |\
| * | Throw exceptions on programming errors for global functions.Warwick Allison2010-04-164-37/+49
* | | Doc: make note about using clip: true in views slightly more prominent.Martin Jones2010-04-163-3/+3
| |/ |/|
* | 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-1653-314/+704
|\
| * 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-1546-309/+647
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1546-309/+647
| | |\
| | | * Support valuetypes as method return valuesAaron Kennedy2010-04-155-40/+99
| | | * 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-1512-99/+126
| | | |\ \ | | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-153-10/+104
| | | | |\
| | | | * | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1511-94/+119
| | | | * | 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-152-12/+5
| | | * | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-156-24/+73
| | | | |/ | | | |/|
| * | | | QListView: Re-fix scrollbar rangesGabriel de Dietrich2010-04-151-4/+10
| * | | | 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-1514-35/+94
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix compilation of ShivaVG, which does not have EGL.Rhys Weatherley2010-04-151-0/+2
| | * | | Move nativePaintingActive flag to GL2 engine's privateTom Cooksey2010-04-142-9/+10
| | * | | More adjustments to QTBUG-6800Carolina Gomes2010-04-143-13/+11
| | * | | Adjustments to QTBUG-6800 patch.Carolina Gomes2010-04-141-8/+6
| | * | | QTBUG-6800 patch included, but only for OpenGL 2.0Carolina Gomes2010-04-143-1/+39
| | * | | Support building with desktop OpenGL managed via EGLTom Cooksey2010-04-148-32/+44
| | * | | Print more information when debugging X11 Visual selectionTom Cooksey2010-04-141-0/+10
| | * | | Fix gcc compile warning in qstatictext.cppEskil Abrahamsen Blomfeldt2010-04-141-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-304047-160751/+330419
| | |\ \ \
| | * | | | Avoid taking sqrt of negative number in FT font engineEskil Abrahamsen Blomfeldt2010-03-301-1/+1
| * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-158-60/+200
| |\ \ \ \ \