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-0743-4139/+4530
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-0721-3407/+3722
| |\
| | * Remove deprecated Flickable.flickDirectionMartin Jones2010-07-073-16/+1
| | * Revert "Fix exponential behavior of QTextCursor::removeSelectedText"Michael Brasser2010-07-072-8/+0
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0639-4115/+4521
| | |\
| | | * Fix performance of QTextDocumentPrivate::adjustDocumentChangesAndCursorsChristian Kamm2010-07-064-21/+22
| | | * Convert QtDeclarative def files to use LF line endingsJoona Petrell2010-07-062-3372/+3372
| | | * Update QtDeclarative def filesJoona Petrell2010-07-062-66/+131
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-07-06121-1315/+2195
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-061-0/+1
| | | | |\
| | | | * | Changing currentIndex shouldn't cancel a flick unnecessarily.Martin Jones2010-07-062-24/+45
| | | * | | doc improvementsBea Lam2010-07-067-30/+83
| * | | | | Make Text, TextInput, and TextEdit all have the same size for the same text.Warwick Allison2010-07-074-21/+29
| | |_|_|/ | |/| | |
| * | | | Fix input methods for TextInput elements with key handlersJoona Petrell2010-07-061-0/+1
| | |_|/ | |/| |
| * | | Fix TextEdit with no color property defined is drawn with wrong colorJoona Petrell2010-07-061-0/+9
| * | | Export QDeclarativePixmapMartin Jones2010-07-061-1/+1
| * | | docWarwick Allison2010-07-061-2/+2
| * | | Fix inconsistent reporting of module import errors when using versions.Warwick Allison2010-07-051-3/+15
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0529-728/+972
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0529-728/+972
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0529-728/+972
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-05217-8797/+5976
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-051-3/+3
| | | | | |\ \ \
| | | | | | * | | <br/> shouldn't trigger a new format range in QDeclarativeStyledText.Michael Brasser2010-07-051-1/+3
| | | | | | * | | Optimize QDeclarativeStyledText.Michael Brasser2010-07-051-2/+0
| | | | | * | | | Work around QTBUG-11929Warwick Allison2010-07-051-1/+2
| | | | | |/ / /
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0416-49/+78
| | | | | |\ \ \
| | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0316-49/+78
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0316-49/+78
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0216-49/+78
| | | | | | | | |\ \ \
| | | | | | | | | * | | Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-022-0/+8
| | | | | | | | | | |/ | | | | | | | | | |/|
| | | | | | | | | * | docs - fix doc links, minor improvementsBea Lam2010-07-021-14/+24
| | | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-029-29/+38
| | | | | | | | | |\ \
| | | | | | | | | | * | Fix TextInput text getting improperly clippedJoona Petrell2010-07-022-19/+28
| | | | | | | | | | * | fix doc linksBea Lam2010-07-027-8/+9
| | | | | | | | | | * | Fix docs to link to the new QML Viewer page instead of the Runtime pageBea Lam2010-07-021-2/+1
| | | | | | | | | * | | Make autotests work with qreal == float (in addition to double).Warwick Allison2010-07-023-4/+4
| | | | | | | | | * | | Don't accept *files* that exist when *directory* is required.Warwick Allison2010-07-021-2/+4
| | | | | | | | | |/ /
| | | | * | | | | | | Make declarative pixmap cache easier to useAaron Kennedy2010-07-0511-675/+889
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-068-34/+121
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Adapt the TapAndHold recognizer to non-touch tooThomas Zander2010-07-061-23/+40
| * | | | | | | | | | add setNativeArguments() and nativeArguments()Oswald Buddenhagen2010-07-067-7/+71
| * | | | | | | | | | fix bogus return value from qprocess::execute()Oswald Buddenhagen2010-07-061-4/+10
| |/ / / / / / / / /
* | | | | | | | | | Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-063-1/+199
|/ / / / / / / / /
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-052-3/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Support time zone designator in QDateTime::fromString() based on ISO 8601-200...Liang Qi2010-07-052-3/+29
| |/ / / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-053-5/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| * | | | | | | | QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| |/ / / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-051-13/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |