Merge master -> api_changes

Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.

Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp
index 38f9eaf9fd..12f9504b7b 100644
--- a/examples/network/torrent/trackerclient.cpp
+++ b/examples/network/torrent/trackerclient.cpp
@@ -108,10 +108,10 @@ void TrackerClient::fetchPeerList()
 
     // Percent encode the hash
     QByteArray infoHash = torrentDownloader->infoHash();
-    QString encodedSum;
+    QByteArray encodedSum;
     for (int i = 0; i < infoHash.size(); ++i) {
         encodedSum += '%';
-        encodedSum += QString::number(infoHash[i], 16).right(2).rightJustified(2, '0');
+        encodedSum += QByteArray::number(infoHash[i], 16).right(2).rightJustified(2, '0');
     }
 
     bool seeding = (torrentDownloader->state() == TorrentClient::Seeding);