diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-29 21:59:03 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-29 21:59:03 +0200 |
| commit | 91119eaa185934d568d0c83e25129b0028b5a607 (patch) | |
| tree | 89f350ae6614aa0d76c3ecc4f114bddde45b05c8 /examples/network | |
| parent | 12e5d8897fbd60def1dd38608c1cd3f0d1d4317b (diff) | |
| parent | e62f0aec863147682fcfcb651d13e0e7cff6d363 (diff) | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
Workaround for QTBUG-8013: Do not return an ascent of 0
Fix crash when all the items in a QListView are hidden
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
One more .pro fix for deprecated INCPATH
Fix Rhys' qmake warnings
Fixed QVideoSurfaceFormat::isValid()
Diffstat (limited to 'examples/network')
| -rw-r--r-- | examples/network/torrent/torrent.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro index 7665455e81..44716fdefb 100644 --- a/examples/network/torrent/torrent.pro +++ b/examples/network/torrent/torrent.pro @@ -5,7 +5,7 @@ HEADERS += addtorrentdialog.h \ metainfo.h \ peerwireclient.h \ ratecontroller.h \ - filemanager.h \ + filemanager.h \ torrentclient.h \ torrentserver.h \ trackerclient.h |