summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge conflicts.Martin Smith2010-07-1379-5180/+5874
|\
| * Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| * Private variable cleanup.Michael Brasser2010-07-133-21/+19
| * wantsFocus should be based on FocusScope chain, not parent chain.Michael Brasser2010-07-132-2/+9
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-121-5/+7
| |\
| | * Doc: Removed links to Qt3 support in QHostAddressGeir Vattekar2010-07-121-5/+7
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-121-0/+6
| |\ \ | | |/ | |/|
| | * Added some asserts to avoid race conditions in networking.axis2010-07-121-0/+6
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-122-17/+21
| |\ \ | | |/ | |/|
| | * Merge remote branch 'oslo-staging-2/4.7' into qtbug-11996Aaron McCarthy2010-07-12110-575/+1983
| | |\
| | * | Quiet qmake warnings during configure.Aaron McCarthy2010-07-082-17/+21
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-127-281/+513
| |\ \ \
| | * | | Minor modifications and optimizations to the Symbian HW glyph cache.Jason Barron2010-07-121-49/+60
| | * | | Convert to new EGL API.Jason Barron2010-07-122-47/+42
| | * | | Don't invert glyphs for the default VG font cache on Symbian.Jason Barron2010-07-121-0/+2
| | * | | Move QVGFontGlyphCache from source file into a separate headerJason Barron2010-07-121-1/+0
| | * | | Ensure glyphs are upright instead of upside-down.Jason Barron2010-07-123-1/+15
| | * | | Enable cross-process glyph cache for OpenVG graphics system on Symbian.Jason Barron2010-07-124-22/+61
| | * | | Factor out RSgImage -> VGImage conversion to separate function.Jason Barron2010-07-121-73/+75
| | * | | Add new file for Symbian specific VG stuff and add Symbian glyph cache.Jason Barron2010-07-125-260/+363
| | * | | Move QVGFontGlyphCache from source file into a separate headerJason Barron2010-07-124-20/+87
| | * | | Make cacheGlyphs() function (and the destructor) virtual.Jason Barron2010-07-121-2/+2
| | | |/ | | |/|
| * | | Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-123-0/+46
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1068-4859/+5258
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1068-4859/+5258
| | |\ \
| | | * | Fix QTextDocument::markContentsDirty()mae2010-07-091-4/+4
| | | * | Resetting bindings through debugger interfaceLasse Holmstedt2010-07-094-0/+44
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-0944-1078/+206
| | | |\ \
| | | | * | Make test pass and fix docs following removal of SpringFollowBea Lam2010-07-092-3/+3
| | | | * | doc improvementsBea Lam2010-07-092-5/+27
| | | | * | Fix crashmae2010-07-082-1/+5
| | | | * | Follow -> Behaviormae2010-07-088-1006/+2
| | | | * | Added some documentation to spring animationmae2010-07-081-0/+9
| | | | * | Fix spring animationmae2010-07-081-1/+3
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0863-4255/+5575
| | | | |\ \
| | | | | * | Update QtDeclarative def filesJoona Petrell2010-07-082-2/+17
| | | | | * | Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-082-3/+16
| | | | | * | Optimization: change signal/slot to function callmae2010-07-084-10/+7
| | | | | * | Don't show warning for attempts to load pixmaps asynchronouslyBea Lam2010-07-081-2/+1
| | | | | * | Remove Image::pixmap property. QML applications should useBea Lam2010-07-083-14/+5
| | | | | * | Update QmlChanges.txtBea Lam2010-07-081-0/+4
| | | * | | | Fix crash with invalid role indexesAaron Kennedy2010-07-091-0/+2
| | | | |/ / | | | |/| |
| | | * | | Don't double delete cancelled pixmap cache requestsAaron Kennedy2010-07-081-3/+9
| | | * | | Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-085-46/+263
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-081-12/+15
| | | |\ \ \
| | | | * | | Micro optimization in QML date/time formatting functions.Michael Brasser2010-07-081-12/+15
| | | * | | | Allow the debugger to modify method bodiesAaron Kennedy2010-07-086-35/+108
| | | |/ / /
| | | * | | QML: Let the debugger now the name of embedded functions within a QML functionOlivier Goffart2010-07-071-1/+1
| | | * | | Added QDeclarativeSpringAnimationmae2010-07-078-2/+604
| | | * | | docsBea Lam2010-07-075-17/+23
generated by cgit v0.12 at 2025-02-11 05:05:45 (GMT)