summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20302-68220/+34223
|\
| * Merge branch 'rtiff392'aavit2010-02-20170-62706/+9373
| |\
| | * license doc updated for libtiff 3.9.2aavit2010-02-161-39/+78
| | * Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| | * Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| | * Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
| * | Merge branch 'rjpeg8'aavit2010-02-20133-5520/+24856
| |\ \
| | * | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-163-12/+23
| | * | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| | * | Add libjpeg 8aavit2010-02-16137-0/+53170
| | * | Delete libjpeg 6baavit2010-02-1690-33896/+0
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-206-134/+114
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-206-134/+114
| |\ \ \ \ |/ / / / /
| * | | | Added exception to destdir location for abld and sbsv2.axis2010-02-191-3/+7
| * | | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-196-134/+110
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1946-253/+1144
|\ \ \ \ \
| * | | | | Add convenience function QTextCursor::positionInBlock()mae2010-02-192-1/+26
| * | | | | Fixed URL in Russian translation.Robert Loehning2010-02-191-1/+1
| * | | | | Designer/Resourceview: Suppress warning about QFileInfo on empty path.Friedemann Kleint2010-02-191-0/+2
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1842-251/+1115
| |\ \ \ \ \
| | * | | | | optimize qstring::simplified()Oswald Buddenhagen2010-02-182-23/+109
| | * | | | | Revert optimizations to QString::appendKai Koehne2010-02-182-42/+4
| | * | | | | unbreak QList::append() and co. againOswald Buddenhagen2010-02-171-1/+1
| | * | | | | Implement bookmark manager widget.kh12010-02-178-52/+606
| | * | | | | optimization: use QList::reserve() and QVector::reserve()Oswald Buddenhagen2010-02-171-1/+3
| | * | | | | amend "purge msvc.net and msvc2002 makespecs"Oswald Buddenhagen2010-02-174-7/+101
| | * | | | | Added QPlainTextEditor::anchorAt(const QPoint &pos)Thorbjørn Lindeijer2010-02-172-0/+22
| | * | | | | Fix memmory leak.kh12010-02-171-0/+1
| | * | | | | Fix spacing.kh12010-02-171-0/+3
| | * | | | | Prevent renaming the bookmarks menu root item, it's just a placeholder.kh12010-02-172-4/+17
| | * | | | | Fix broken set last shown pagen when the last page was about:blank.kh12010-02-171-2/+3
| | * | | | | Move launch with external app in base class.kh12010-02-176-103/+82
| | * | | | | Make sure the bookmarks menu updates on add/ remove as well.kh12010-02-171-4/+6
| | * | | | | Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.kh12010-02-171-3/+10
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1717-56/+194
| | |\ \ \ \ \
| | | * | | | | avoid double reallocations in appending operationsOswald Buddenhagen2010-02-162-4/+42
| | | * | | | | avoid double reallocation in string-growing replace() caseOswald Buddenhagen2010-02-161-1/+2
| | | * | | | | optimize qHash() some moreOswald Buddenhagen2010-02-161-8/+4
| | | * | | | | optimize QList::mid()Oswald Buddenhagen2010-02-162-3/+22
| | | * | | | | optimization: use QList::reserve() in QSet::toList()Oswald Buddenhagen2010-02-161-0/+1
| | | * | | | | add QList::reserve()Oswald Buddenhagen2010-02-162-8/+57
| | | * | | | | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-1610-30/+29
| | | * | | | | add QString(const QChar *) c'torOswald Buddenhagen2010-02-162-2/+37
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-19305-5704/+5976
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Speed up QmlGraphicsItem::setParentItem."Bjørn Erik Nilsen2010-02-191-5/+1
| * | | | | | | | Fix dynamic exampleAlan Alpert2010-02-191-0/+1
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-193-13/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix tst_QmlGraphicsLoader::networkRequestUrl autotest.Michael Brasser2010-02-191-2/+2
| | * | | | | | | | Fix tst_qmlgraphicstextedit::delegateLoading autotestLeonardo Sobral Cunha2010-02-191-8/+2
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-193-8/+5
| | |\ \ \ \ \ \ \ \