summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-07-29 07:46:48 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-07-29 07:46:48 (GMT)
commit940b5b23268193d58d7e229bf97a22276098790b (patch)
treeaf532e70e2646012b6a856bab48a105389bc2098 /examples
parentd1e1f49ea0b742fd655112fdb30f5751e142a766 (diff)
parent0041606aefae5da0ff6c8187540f3eff33cbb643 (diff)
downloadQt-940b5b23268193d58d7e229bf97a22276098790b.zip
Qt-940b5b23268193d58d7e229bf97a22276098790b.tar.gz
Qt-940b5b23268193d58d7e229bf97a22276098790b.tar.bz2
Merge remote branch 'origin/4.6' into 4.7-from-4.6
Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/itemviews/qlistview.cpp tests/auto/qlistview/tst_qlistview.cpp tests/auto/qnetworkreply/test/test.pro tests/auto/qsocks5socketengine/qsocks5socketengine.pro
Diffstat (limited to 'examples')
-rw-r--r--examples/network/torrent/torrent.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro
index 7665455..44716fd 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