summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-144-4/+53
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-134-4/+53
| |\
| | * Fixes QGraphicsItem::focusItem() returning incorrect value.Yoann Lopes2010-07-132-2/+31
| | * Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-132-2/+22
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1435-427/+711
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-149-10/+174
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-146-3/+144
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-1421-417/+522
| | | |\ \
| | | * | | Position GridView and ListView footer correctly when model cleared.Martin Jones2010-07-146-3/+144
| | * | | | Clean up particle motion documentationAlan Alpert2010-07-141-3/+16
| | * | | | Finish QML for Qt Programmers sectionAlan Alpert2010-07-141-2/+10
| | * | | | Distinguish Qt Quick, Qt Declarative and QML on the landing pageAlan Alpert2010-07-141-2/+4
| | | |/ / | | |/| |
| * | | | 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-1424-123/+154
| |\ \ \
| | * | | improvements to docs and examplesBea Lam2010-07-1413-82/+115
| | * | | Fix test for get() to check for undefined return valuesBea Lam2010-07-141-4/+6
| | |/ /
| | * | Enter key performs same action as Return key in QML demos.Martin Jones2010-07-145-0/+9
| |/ / |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-131-18/+12
|\ \ \ | |_|/ |/| |
| * | 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.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
* | | | | 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
|\ \ \ \ \ | |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1311-36/+119
|\ \ \ \ \ | | |/ / / | |/| | |
| | | | * Split responsibilities in QDeclarativeExpression more cleanlyAaron Kennedy2010-07-147-331/+401
| | | |/ | | |/|
| | * | Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| |/ /
| * | 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