summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-066-131/+263
|\
| * 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-056-131/+261
| |\
| | * Issue a warning and disable webkit build when xrender is disabled on X11Christian Strømme2010-10-051-0/+6
| | * 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
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix GL glyph cache with broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-061-1/+1
|/ / /
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-0548-352/+788
|\ \ \ | |/ / |/| |
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-0548-352/+788
| |\ \ |/ / /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0548-353/+789
| |\ \
| | * | Document and test paintedWidth and paintedHeight properties of ImageYann Bodson2010-10-052-0/+50
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0546-353/+739
| | |\ \ | |/ / /
| | * | 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-0446-353/+698
| | |\ \
| | | * | Improve test coverage for declarative module.Michael Brasser2010-10-049-4/+76
| | | * | Avoid potential null dereference.Martin Jones2010-10-042-2/+2
| | | * | Add autotest for reserved words in QML.Michael Brasser2010-10-041-0/+76
| | | * | Prevent crash in XmlListModel when appending an empty role.Michael Brasser2010-10-043-1/+19
| | | * | 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-0128-85/+470
| | | |\ \
| | | | * | 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-015-9/+58
| | | | * | Doc: add missing image.Yann Bodson2010-10-012-7/+7
| | | | * | Doc: typographical and spelling errors.Yann Bodson2010-10-0114-28/+28
| | | | * | Doc: remove unfinished and confusing mention to focus panels.Yann Bodson2010-10-011-10/+0
| | | | * | 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 branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-0551-245/+661
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0529-110/+381
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-044-27/+40
| | |\ \ \ \
| | | * | | | Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-044-27/+40
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-0412-40/+235
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-0414-40/+244
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-09-302-0/+9
| | | | |\ \ \
| | | | | * | | Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | | |/ / /
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-09-2312-35/+235
| | | | |\ \ \
| | | | | * | | 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-2212-35/+235
| | | | |/ / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0439-862/+405
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |