summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005fJan-Arve Sæther2011-01-132-2/+29
* Build failure fix (related to QT-4079)Sami Merila2011-01-101-1/+1
* QWidgets support for VGA screenSami Merila2011-01-101-1/+3
* Fix crash when closing QFontDialog::getFont() dialogGabriel de Dietrich2011-01-031-0/+9
* Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2354-598/+3351
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-231-6/+18
| |\
| | * Fix fullscreen/Maximized dialog misplacement in SymbianMiikka Heikkinen2010-12-231-6/+18
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-233-36/+88
| |\ \
| | * | Add Postgresql 8.x and 9 supportsCharles Yin2010-12-233-36/+88
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-2346-550/+3199
| |\ \ | | |/ | |/|
| | * WorkerScript could starve image loading of CPU.Martin Jones2010-12-231-1/+1
| | * More docs for FolderListModelMartin Jones2010-12-231-0/+33
| | * Improve docs on attached properties on view delegates.Martin Jones2010-12-237-8/+75
| | * Models which load incrementally via fetchMore() don't work.Martin Jones2010-12-235-1/+193
| | * Try fixing build error on WindowsBea Lam2010-12-231-1/+1
| | * Ensure PathView doesn't jump when starting to drag.Martin Jones2010-12-2317-520/+524
| | * Nested flickables would react alternately to flicks.Martin Jones2010-12-239-2/+2213
| | * Improve QDeclarativeComponent test coverage.Michael Brasser2010-12-223-12/+15
| | * Add additional QDeclarativeProperty autotests.Michael Brasser2010-12-221-0/+62
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-224-5/+82
| | |\
| | | * Removing all visible items in ListView resulted in blank view.Martin Jones2010-12-222-5/+12
| | | * XmlListModel requests should set 'Accept' header to 'application/xml'Bea Lam2010-12-222-0/+70
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-231-3/+32
| |\ \ \
| | * | | Improve performance of bilinear upscaling of images with neon.Samuel Rødal2010-12-221-3/+32
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-233-3/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix crash in indeterminate progressbars on windowsJens Bache-Wiig2010-12-223-3/+13
| | * | | Fix timer regression for indeterminate progressbarsJens Bache-Wiig2010-12-221-0/+1
* | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-227-123/+228
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-222-2/+12
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix infinite loop in qmake when reading malformed .ts files.Miikka Heikkinen2010-12-221-1/+1
| | * | | Fix libinfixed usage in Symbian when def files are usedMiikka Heikkinen2010-12-221-1/+11
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-222-28/+109
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Made documentation of QPixmap::createMaskFromColor match behaviour.Samuel Rødal2010-12-221-2/+2
| | * | | Improve performance of bilinear downscaling of images with neon.Samuel Rødal2010-12-221-26/+107
| | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-223-93/+107
| |\ \ \ | | |/ / | |/| / | | |/
| | * Document the 'variant' basic typeBea Lam2010-12-222-12/+87
| | * Add double type to QML Basic Types docsBea Lam2010-12-221-0/+20
| | * Remove redundant docsBea Lam2010-12-221-81/+0
| |/
* | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-2158-3499/+2125
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-2152-3464/+1943
| |\
| | * Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-15105-3511/+2294
| | |\
| | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1428-85/+286
| | | |\
| | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1342-157/+802
| | | |\ \
| | | * | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-82/+30
| | | * | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-138-2692/+768
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-1328-187/+345
| | | |\ \ \
| | | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-111-0/+7
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1016-174/+276
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0910-12/+61
| | | | |\ \ \ \ \