Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-06 | 5 | -131/+257 |
|\ | |||||
| * | QNAM: Compile fix for Symbian.. hopefully. | Markus Goetz | 2010-10-06 | 1 | -0/+2 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-05 | 5 | -131/+255 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-05 | 5 | -131/+255 |
| | |\ | |||||
| | | * | QNAM: Move out function calls to new variable | Markus Goetz | 2010-10-05 | 1 | -2/+3 |
| | | * | QNAM: Remove QNetworkAccessDataBackend | Markus Goetz | 2010-10-05 | 3 | -130/+1 |
| | | * | QNAM: Fix usage of toString of QUrl | Markus Goetz | 2010-10-05 | 1 | -1/+1 |
| | | * | QNAM: New specialized QNetworkReply for data: URLs | Markus Goetz | 2010-10-05 | 4 | -0/+252 |
* | | | | Fix GL glyph cache with broken-fbo-fallback | Eskil Abrahamsen Blomfeldt | 2010-10-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-05 | 16 | -306/+493 |
|\ \ \ | |/ / |/| | | |||||
| * | | Document and test paintedWidth and paintedHeight properties of Image | Yann Bodson | 2010-10-05 | 1 | -0/+9 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-05 | 15 | -306/+484 |
| |\ \ | |||||
| | * | | Add missing license header. | Michael Brasser | 2010-10-04 | 1 | -0/+41 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-04 | 15 | -306/+443 |
| | |\ \ | |||||
| | | * | | Improve test coverage for declarative module. | Michael Brasser | 2010-10-04 | 1 | -2/+1 |
| | | * | | Avoid potential null dereference. | Martin Jones | 2010-10-04 | 2 | -2/+2 |
| | | * | | Prevent crash in XmlListModel when appending an empty role. | Michael Brasser | 2010-10-04 | 1 | -1/+1 |
| | | * | | Remove unused, unexported class. | Michael Brasser | 2010-10-04 | 3 | -260/+0 |
| | | * | | Fix clipping behavior for non-cached text. | Michael Brasser | 2010-10-04 | 2 | -2/+1 |
| | | * | | Compile | Aaron Kennedy | 2010-10-04 | 2 | -0/+55 |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-01 | 8 | -40/+384 |
| | | |\ \ | |||||
| | | | * | | Only cache textlayout in paint engines that support transformations | Aaron Kennedy | 2010-10-01 | 1 | -1/+6 |
| | | | * | | QmlDebugService: Fix compiler warning about cast from ascii | Kai Koehne | 2010-10-01 | 1 | -2/+2 |
| | | | * | | Qt.openUrlExternally should resolve relative URLs. | Michael Brasser | 2010-10-01 | 1 | -9/+7 |
| | | | * | | Apply the QStaticText text-caching strategy for QML | Aaron Kennedy | 2010-10-01 | 6 | -28/+369 |
| | | | * | | Documentation: input to Qt.rgba should be from 0-1, not 0-255. | Michael Brasser | 2010-10-01 | 1 | -1/+1 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-10-05 | 2 | -24/+25 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Work around OpenGL driver reading arrays asyncronously | Eskil Abrahamsen Blomfeldt | 2010-10-05 | 2 | -24/+25 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-05 | 4 | -35/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | QNAM: Rename QFileNetworkReply to QNetworkReplyFileImpl | Markus Goetz | 2010-10-05 | 4 | -35/+35 |
| |/ / / / / | |||||
* | | | | | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-05 | 23 | -84/+213 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-04 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case. | Chris Meyer | 2010-10-04 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-10-04 | 10 | -40/+141 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6 | Rohan McGovern | 2010-10-04 | 12 | -40/+150 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Build fix for -qtnamespace. | Leandro Melo | 2010-09-30 | 2 | -0/+9 |
| | | * | | | Fix compile failure in QtMultimedia. | Andrew den Exter | 2010-09-23 | 1 | -3/+3 |
| | | * | | | Verify the audio format before trying to open an audio device. | Andrew den Exter | 2010-09-22 | 10 | -35/+141 |
| * | | | | | Fixed antialiased rendering error in raster engine due to wrong merge. | Samuel Rødal | 2010-10-01 | 1 | -2/+0 |
| * | | | | | FocusOut even when QGraphicsItem gets hidden. | Frederik Gladhorn | 2010-10-01 | 1 | -3/+5 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-01 | 32 | -494/+265 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-01 | 32 | -494/+265 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-09-30 | 32 | -494/+265 |
| | | |\ \ \ | |||||
| | | | * | | | Fixed accessing freed memory in raster engine. | Kim Motoyoshi Kalland | 2010-09-30 | 1 | -2/+2 |
| | | | * | | | Build fix for -qtnamespace. | Leandro Melo | 2010-09-30 | 2 | -0/+9 |
| | | | * | | | Fixed parsing of SVGs with absolute font sizes. | Kim Motoyoshi Kalland | 2010-09-30 | 1 | -1/+32 |
| | | | * | | | Moving QPdf::stripSpecialCharacter to fontengine | Jørgen Lind | 2010-09-30 | 7 | -37/+23 |
| | | | * | | | Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine" | Thierry Bastian | 2010-09-30 | 4 | -318/+13 |
* | | | | | | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7 | Rohan McGovern | 2010-10-05 | 18 | -132/+184 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fixed a layout issue where you could get NaN as dimensions | Thierry Bastian | 2010-09-30 | 1 | -12/+11 |