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 | 6 | -131/+263 |
|\ | |||||
| * | 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 | 6 | -131/+261 |
| |\ | |||||
| | * | Issue a warning and disable webkit build when xrender is disabled on X11 | Christian Strømme | 2010-10-05 | 1 | -0/+6 |
| | * | 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 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-10-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix GL glyph cache with broken-fbo-fallback | Eskil Abrahamsen Blomfeldt | 2010-10-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-10-05 | 48 | -352/+788 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-05 | 48 | -352/+788 |
| |\ \ |/ / / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-05 | 48 | -353/+789 |
| |\ \ | |||||
| | * | | Document and test paintedWidth and paintedHeight properties of Image | Yann Bodson | 2010-10-05 | 2 | -0/+50 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-05 | 46 | -353/+739 |
| | |\ \ | |/ / / | |||||
| | * | | 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 | 46 | -353/+698 |
| | |\ \ | |||||
| | | * | | Improve test coverage for declarative module. | Michael Brasser | 2010-10-04 | 9 | -4/+76 |
| | | * | | Avoid potential null dereference. | Martin Jones | 2010-10-04 | 2 | -2/+2 |
| | | * | | Add autotest for reserved words in QML. | Michael Brasser | 2010-10-04 | 1 | -0/+76 |
| | | * | | Prevent crash in XmlListModel when appending an empty role. | Michael Brasser | 2010-10-04 | 3 | -1/+19 |
| | | * | | 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 | 28 | -85/+470 |
| | | |\ \ | |||||
| | | | * | | 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 | 5 | -9/+58 |
| | | | * | | Doc: add missing image. | Yann Bodson | 2010-10-01 | 2 | -7/+7 |
| | | | * | | Doc: typographical and spelling errors. | Yann Bodson | 2010-10-01 | 14 | -28/+28 |
| | | | * | | Doc: remove unfinished and confusing mention to focus panels. | Yann Bodson | 2010-10-01 | 1 | -10/+0 |
| | | | * | | 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 branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-10-05 | 51 | -245/+661 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-05 | 29 | -110/+381 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 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 | 4 | -27/+40 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case. | Chris Meyer | 2010-10-04 | 4 | -27/+40 |
| | * | | | | | 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 | 12 | -40/+235 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6 | Rohan McGovern | 2010-10-04 | 14 | -40/+244 |
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-09-30 | 2 | -0/+9 |
| | | | |\ \ \ | |||||
| | | | | * | | | Build fix for -qtnamespace. | Leandro Melo | 2010-09-30 | 2 | -0/+9 |
| | | | |/ / / | |||||
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-09-23 | 12 | -35/+235 |
| | | | |\ \ \ | |||||
| | | | | * | | | 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 | 12 | -35/+235 |
| | | | |/ / / | |||||
| | * | | | | | 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 | 39 | -862/+405 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| | |