summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix input methods for TextInput elements with key handlersJoona Petrell2010-07-063-8/+23
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-062-0/+27
|\
| * Fix TextEdit with no color property defined is drawn with wrong colorJoona Petrell2010-07-062-0/+27
* | Document the QML enumeration basic typeMartin Jones2010-07-061-0/+23
|/
* 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-057-8/+37
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0571-956/+1337
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0571-956/+1337
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0571-956/+1337
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-05344-9538/+7674
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-051-26/+12
| | | | |\
| | | | | * Set correct license header.Jason McDonald2010-07-051-26/+12
| | | | * | Prepare for QTest persistent store for visual tests.Warwick Allison2010-07-051-22/+22
| | | | * | Loosen font-sensitive test.Warwick Allison2010-07-051-1/+2
| | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-052-3/+44
| | | | |\
| | | | | * <br/> shouldn't trigger a new format range in QDeclarativeStyledText.Michael Brasser2010-07-051-1/+3
| | | | | * Add styled text layout benchmark.Michael Brasser2010-07-051-0/+41
| | | | | * 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-0456-174/+329
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0356-174/+329
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0356-174/+329
| | | | | | |\
| | | | | | | * Don't write to the logger widget while the application is closing down.Robert Griebl2010-07-021-1/+1
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0255-173/+328
| | | | | | | |\
| | | | | | | | * Fix exponential behavior of QTextCursor::removeSelectedTextmae2010-07-022-0/+8
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-021-14/+24
| | | | | | | | |\
| | | | | | | | | * docs - fix doc links, minor improvementsBea Lam2010-07-021-14/+24
| | | | | | | | * | Fix test for N900 (ARM-specific SVG results).Warwick Allison2010-07-024-8/+6
| | | | | | | | |/
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-0237-299/+380
| | | | | | | | |\
| | | | | | | | | * Fix TextEdit bitmap tests testing the wrong elementJoona Petrell2010-07-022-4/+4
| | | | | | | | | * Fix TextInput text getting improperly clippedJoona Petrell2010-07-029-22/+110
| | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-02153-8569/+5927
| | | | | | | | | |\
| | | | | | | | | | * fix doc linksBea Lam2010-07-0210-11/+12
| | | | | | | | | | * Fix docs to link to the new QML Viewer page instead of the Runtime pageBea Lam2010-07-0211-29/+45
| | | | | | | | | * | qmlviewer: Update the proxy factory when the user changes the proxy.Martin Jones2010-07-021-42/+62
| | | | | | | | * | | Make autotests work with qreal == float (in addition to double).Warwick Allison2010-07-0216-51/+58
| | | | | | | | * | | Don't accept *files* that exist when *directory* is required.Warwick Allison2010-07-024-2/+9
| | | * | | | | | | | Make declarative pixmap cache easier to useAaron Kennedy2010-07-0512-733/+930
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-054-4/+41
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Support time zone designator in QDateTime::fromString() based on ISO 8601-200...Liang Qi2010-07-054-4/+41
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0511-36/+161
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| * | | | | | | | | | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| * | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-055-15/+61
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| | * | | | | | | | | | Doc: fixing search script and styleMorten Engvoldsen2010-07-053-15/+43
| * | | | | | | | | | | qdoc: Added explanation of autmatically generated signal hanlers.Martin Smith2010-07-051-12/+58
| |/ / / / / / / / / /
| * | | | | | | | | | qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |