diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-24 03:40:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-24 03:40:21 (GMT) |
| commit | c2576151d668115f019f31df69dcb9b34a6723e4 (patch) | |
| tree | a12567bb858edbc5199a499a84bee23c2b7a9d45 /src/network | |
| parent | 0067b1fd6ce3abb2600de9567039fd9710b176d2 (diff) | |
| parent | e645157a5dcf702df21b566441a56753eaefe6c4 (diff) | |
| download | Qt-c2576151d668115f019f31df69dcb9b34a6723e4.zip Qt-c2576151d668115f019f31df69dcb9b34a6723e4.tar.gz Qt-c2576151d668115f019f31df69dcb9b34a6723e4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build after first webkit self-injection attempt
Fixed touch event delivery in QGraphicsView.
let WebKit inject itself into the qt configuration
add indirect input/output specification capability to QMAKE_SUBSTITUTES
Add test that exercises lupdate warnings for QtScript
Make qsTrId() / QT_TRID_NOOP() accessible from QtScript
Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()
Add support for comments and meta-data in the lupdate QtScript frontend
Streamline lupdate's QtScript frontend's error messaging
Doc: linking up orphant files
Doc: Updating menu links
Diffstat (limited to 'src/network')
0 files changed, 0 insertions, 0 deletions