summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-065-131/+257
|\
| * QNAM: Compile fix for Symbian.. hopefully.Markus Goetz2010-10-061-0/+2
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-055-131/+255
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-055-131/+255
| | |\
| | | * QNAM: Move out function calls to new variableMarkus Goetz2010-10-051-2/+3
| | | * QNAM: Remove QNetworkAccessDataBackendMarkus Goetz2010-10-053-130/+1
| | | * QNAM: Fix usage of toString of QUrlMarkus Goetz2010-10-051-1/+1
| | | * QNAM: New specialized QNetworkReply for data: URLsMarkus Goetz2010-10-054-0/+252
* | | | Fix GL glyph cache with broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-061-1/+1
|/ / /
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-0516-306/+493
|\ \ \ | |/ / |/| |
| * | Document and test paintedWidth and paintedHeight properties of ImageYann Bodson2010-10-051-0/+9
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0515-306/+484
| |\ \
| | * | Add missing license header.Michael Brasser2010-10-041-0/+41
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0415-306/+443
| | |\ \
| | | * | Improve test coverage for declarative module.Michael Brasser2010-10-041-2/+1
| | | * | Avoid potential null dereference.Martin Jones2010-10-042-2/+2
| | | * | Prevent crash in XmlListModel when appending an empty role.Michael Brasser2010-10-041-1/+1
| | | * | Remove unused, unexported class.Michael Brasser2010-10-043-260/+0
| | | * | Fix clipping behavior for non-cached text.Michael Brasser2010-10-042-2/+1
| | | * | CompileAaron Kennedy2010-10-042-0/+55
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-018-40/+384
| | | |\ \
| | | | * | Only cache textlayout in paint engines that support transformationsAaron Kennedy2010-10-011-1/+6
| | | | * | QmlDebugService: Fix compiler warning about cast from asciiKai Koehne2010-10-011-2/+2
| | | | * | Qt.openUrlExternally should resolve relative URLs.Michael Brasser2010-10-011-9/+7
| | | | * | Apply the QStaticText text-caching strategy for QMLAaron Kennedy2010-10-016-28/+369
| | | | * | Documentation: input to Qt.rgba should be from 0-1, not 0-255.Michael Brasser2010-10-011-1/+1
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-052-24/+25
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Work around OpenGL driver reading arrays asyncronouslyEskil Abrahamsen Blomfeldt2010-10-052-24/+25
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-054-35/+35
|\ \ \ \ \ \
| * | | | | | QNAM: Rename QFileNetworkReply to QNetworkReplyFileImplMarkus Goetz2010-10-054-35/+35
| |/ / / / /
* | | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0523-84/+213
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-041-1/+1
| |\ \ \ \ \
| | * | | | | Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-041-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-0410-40/+141
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-0412-40/+150
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | * | | Fix compile failure in QtMultimedia.Andrew den Exter2010-09-231-3/+3
| | | * | | Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-2210-35/+141
| * | | | | Fixed antialiased rendering error in raster engine due to wrong merge.Samuel Rødal2010-10-011-2/+0
| * | | | | FocusOut even when QGraphicsItem gets hidden.Frederik Gladhorn2010-10-011-3/+5
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0132-494/+265
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0132-494/+265
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-3032-494/+265
| | | |\ \ \
| | | | * | | Fixed accessing freed memory in raster engine.Kim Motoyoshi Kalland2010-09-301-2/+2
| | | | * | | Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | | * | | Fixed parsing of SVGs with absolute font sizes.Kim Motoyoshi Kalland2010-09-301-1/+32
| | | | * | | Moving QPdf::stripSpecialCharacter to fontengineJørgen Lind2010-09-307-37/+23
| | | | * | | Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"Thierry Bastian2010-09-304-318/+13
* | | | | | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-0518-132/+184
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed a layout issue where you could get NaN as dimensionsThierry Bastian2010-09-301-12/+11