summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-07-06172-1601/+2759
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-063-8/+23
| | | | | |\
| | | | | * | Changing currentIndex shouldn't cancel a flick unnecessarily.Martin Jones2010-07-062-24/+45
| | | | * | | doc improvementsBea Lam2010-07-0610-36/+129
| * | | | | | Make Text, TextInput, and TextEdit all have the same size for the same text.Warwick Allison2010-07-076-25/+33
| * | | | | | More generated images in anticipation of QT-3574Warwick Allison2010-07-072-28/+45
| | |_|_|_|/ | |/| | | |
| * | | | | 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/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0716-463/+299
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0616-463/+299
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | fix autotestOswald Buddenhagen2010-07-061-0/+5
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0615-463/+294
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Adapt the TapAndHold recognizer to non-touch tooThomas Zander2010-07-061-23/+40