summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix an Assert in QTextTablePierre Rossi2010-07-132-4/+78
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-132-2/+19
|\
| * QSslSocket: Improve error handlingPeter Hartmann2010-07-131-1/+13
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-13124-2190/+2022
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-131-1/+6
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-134-18/+10
| | |\ \
| | * | | Ensure the section header isn't shown twice.Martin Jones2010-07-131-1/+6
* | | | | doc: Fixed several qdoc warnings.Martin Smith2010-07-132-3/+4
| |_|_|/ |/| | |
* | | | Fixing merge conflicts.Martin Smith2010-07-13189-6069/+7293
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-133-18/+6
| |\ \ \ | | | |/ | | |/|
| | * | Only support portrait and landscape orientations on Symbian when updating the...Joona Petrell2010-07-133-18/+6
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-131-0/+4
| |\ \ \ | | |/ /
| | * | Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1311-36/+119
| |\ \ | | |/
| | * Autotest for QTBUG-5491 (Animation in a Behavior doesn't update running)Michael Brasser2010-07-132-0/+38
| | * Private variable cleanup.Michael Brasser2010-07-133-21/+19
| | * wantsFocus should be based on FocusScope chain, not parent chain.Michael Brasser2010-07-138-15/+62
| |/
| * 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/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-123-50/+40
| |\ \ \ | | |_|/ | |/| |
| | * | Calling setMinimumSize(0, 0) on a top-level window sometimes triggers a bugRobert Griebl2010-07-123-50/+40
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-123-19/+23
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote branch 'oslo-staging-2/4.7' into qtbug-11996Aaron McCarthy2010-07-12143-1147/+5629
| | |\ \
| | | * | Fix qdoc error.Jason McDonald2010-07-121-2/+2
| | * | | 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
| | | |/ / | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-12168-5684/+6603
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Remove use of SpringFollow and SmoothedFollow in qmlvisual testBea Lam2010-07-123-31/+42
| | * | Fix Mac CIJoona Petrell2010-07-122-0/+24
| | * | Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-125-1/+117
| | * | Fix .pro file after class/test rename.Michael Brasser2010-07-111-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-10165-5651/+6419
| | |\ \ | |/ / /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-10165-5651/+6419
| | |\ \
| | | * | Fix QTextDocument::markContentsDirty()mae2010-07-091-4/+4
| | | * | Replace 4.6 in all .qdocconf filesKai Koehne2010-07-092-8/+8
| | | * | 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-0978-1482/+343
| | | |\ \
| | | | * | Make test pass and fix docs following removal of SpringFollowBea Lam2010-07-093-5/+5