summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0448-486/+591
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | make image handler includes privateOswald Buddenhagen2010-07-0418-32/+32
| * | | | | | fix symbian buildOswald Buddenhagen2010-07-031-2/+2
| * | | | | | doc improvementsOswald Buddenhagen2010-07-031-5/+4
| * | | | | | rebuild configureOswald Buddenhagen2010-07-031-0/+0
| * | | | | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-07-031-1/+2
| * | | | | | Fix Windows buildMark Brand2010-07-031-4/+4
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0341-456/+561
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0241-456/+561
| |\ \ \ \ \ \
| | * | | | | | Consolidate zlib configuration redundancyMark Brand2010-07-026-64/+21
| | * | | | | | Fixed whitespace formattingMark Brand2010-07-021-55/+57
| | * | | | | | Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-026-55/+155
| | * | | | | | Split image handler plugin project filesMark Brand2010-07-0225-208/+204
| | * | | | | | No explicit link to zlib/jpeg for system mng/tiffMark Brand2010-07-022-19/+14
| | * | | | | | Removed stray line continuationsMark Brand2010-07-021-4/+2
| | * | | | | | Long live else!Mark Brand2010-07-021-4/+4
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-02459-10752/+10430
| | |\ \ \ \ \ \
| | | * | | | | | Fixed size hint for combo box on windowsJens Bache-Wiig2010-06-112-25/+4
| | * | | | | | | qdoc: Added a solution for creating tables of contents for manuals.David Boddie2010-07-023-34/+112
| | * | | | | | | Doc: Fixed markup.David Boddie2010-06-302-4/+4
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0352-197/+644
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0252-197/+644
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Hide some more files from git-status.axis2010-07-022-0/+4
| | * | | | | | | Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+1
| | * | | | | | | Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-025-11/+26
| | * | | | | | | Fixed deployment locations for various profiles.axis2010-07-025-5/+8
generated by cgit v0.12 at 2024-11-25 20:27:52 (GMT)