summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-285-10/+54
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-281-1/+1
| |\
| | * Make compileBea Lam2010-04-281-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-288-53/+153
| |\ \ | | |/
| * | Fix snap at view boundaries with overshoot on.Martin Jones2010-04-282-8/+14
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2820-29/+50
| |\ \
| * | | Emit hoverChanged appropriately when Item visibility changes.Martin Jones2010-04-282-1/+39
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-288-53/+153
|\ \ \ \ | | |_|/ | |/| |
| * | | Doc fixesBea Lam2010-04-286-52/+79
| * | | Setting conflicting anchors to items inside positioners should print a warningJoona Petrell2010-04-282-1/+74
| | |/ | |/|
* | | Small cleanupsAaron Kennedy2010-04-282-59/+19
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-2724-112/+354
|\ \ | |/
| * Ensure text document is created before we access it.Martin Jones2010-04-271-0/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-2723-112/+353
| |\
| | * Plugins documentation.Bea Lam2010-04-271-4/+11
| | * Fix update issue when an item has an effect and child.Alexis Menard2010-04-271-1/+1
| | * Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints.Alexis Menard2010-04-273-10/+48
| | * Disallow "Qt" as namespace importAaron Kennedy2010-04-271-0/+8
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-274-12/+37
| | |\
| | | * Don't "adjust" the z value of a delegate that has been cached.Martin Jones2010-04-274-12/+37
| | * | Correctly inherit extension propertiesAaron Kennedy2010-04-272-2/+2
| | * | AutotestsAaron Kennedy2010-04-271-9/+8
| | |/
| | * More QDeclarativeNetworkAccessManagerFactory doc clarification.Martin Jones2010-04-271-1/+3
| | * Fix QDeclarativeNetworkAccessManagerFactory docs.Martin Jones2010-04-271-4/+1
| | * Don't crash on invalid model remove signal.Martin Jones2010-04-271-4/+9
| | * Fix remaining 4.6 type registrations (to 4.7).Warwick Allison2010-04-271-2/+2
| | * doc anchor margins vs. anchor (line) state/animation.Warwick Allison2010-04-262-2/+10
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-266-61/+213
| | |\
| | | * Improved error messages for type resolving, new debug optionmae2010-04-263-55/+133
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-6/+80
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-6/+80
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-6/+80
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-233-6/+80
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2326-102/+167
| | | | | | | |\
| | | | | | | | * Return null if creation fails.Michael Brasser2010-04-231-3/+5
| | | | | | | | * Basic Component doc.Michael Brasser2010-04-231-1/+74
| | | | | | | * | no export in pluginWarwick Allison2010-04-231-1/+1
| | | | | | | * | compileWarwick Allison2010-04-221-2/+1
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-273-12/+16
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-2718-93/+144
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix attempted invocation of non-existent timerActivated() slot.Andrew den Exter2010-04-271-2/+2
| | * | | | | | | | | Fix up qdocs for mediaservices namespace.Kurt Korbatits2010-04-271-9/+9
| | |/ / / / / / / /
| * | | | | | | | | MediaServices; Don't look at the debug info when looking for plugins.Justin McPherson2010-04-271-1/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-273-11/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "QDialog: user-moved dialog would not show on the same place after hide"Gabriel de Dietrich2010-04-273-11/+11
| |/ / / / / / / /
* | | | | | | | | Cocoa: Native QFileDialog has problems selecting name filterRichard Moe Gustavsen2010-04-271-1/+1
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-04-27465-5674/+7292
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-265-9/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add translator commentOswald Buddenhagen2010-04-261-0/+3
| | * | | | | | | | save a QFile::encodeName()Oswald Buddenhagen2010-04-261-3/+3