summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-154-10/+16
|\
| * fix doc linkBea Lam2010-07-151-1/+1
| * fix spellingBea Lam2010-07-151-1/+1
| * Text element does not clip even with clip=trueYann Bodson2010-07-152-8/+14
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-157-12/+20
|\ \ | |/ |/|
| * QFileDialog : Fix completer showing up on the MyComputer view.Alexis Menard2010-07-151-1/+3
| * Amend previous commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf to fix compila...Olivier Goffart2010-07-154-4/+10
| * Compile with QT_NO_DEBUG_STREAMOlivier Goffart2010-07-144-6/+8
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-07-1416-384/+495
| |\
| * | Work around memory leak issue in grid and linear layouts.Andreas Aardal Hanssen2010-07-142-8/+6
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-142-0/+2
|\ \ \ | |_|/ |/| |
| * | Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713Lasse Holmstedt2010-07-142-0/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-142-4/+6
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-132-4/+6
| |\
| | * Fixes QGraphicsItem::focusItem() returning incorrect value.Yoann Lopes2010-07-131-2/+4
| | * Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-131-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-143-6/+25
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-142-3/+9
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-1413-378/+464
| | |\ \ \
| | * | | | Position GridView and ListView footer correctly when model cleared.Martin Jones2010-07-142-3/+9
| | | |/ / | | |/| |
| * | | | Clean up particle motion documentationAlan Alpert2010-07-141-3/+16
| | |/ / | |/| |
* | | | Check for binding having been deleted in more placesAaron Kennedy2010-07-141-0/+6
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-148-66/+81
|\ \ \
| * | | improvements to docs and examplesBea Lam2010-07-146-47/+63
| |/ /
| * | Merge branch 'networkHangFixes' into 4.7-s60axis2010-07-131-18/+12
| |\ \ | | |/ | |/|
| | * Revert "Making network reconnect happen after teardown."axis2010-07-131-6/+2
| | * Revert "Adding some error checking for setdefaultif"axis2010-07-131-3/+1
| | * Fixed a possible hanging bug in the Symbian networking.axis2010-07-131-1/+2
| | * Fixed a network hanging bug on Symbian.axis2010-07-131-9/+8
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-131-0/+4
| |\ \
| * | | Ensure the section header isn't shown twice.Martin Jones2010-07-131-1/+6
* | | | Split responsibilities in QDeclarativeExpression more cleanlyAaron Kennedy2010-07-147-331/+401
| |/ / |/| |
* | | 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