Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ia7b15fdde5acaebae8661441095730b2350437ca

2 files changed, 3 insertions, 1 deletions

diff --git a/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc b/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc
index 7b9e79b..2a7fa4c 100644
--- a/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc
+++ b/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc
@@ -39,6 +39,8 @@
 
     To use this example, a consumer key and secret from Twitter are needed.
     To register the application visit https://apps.twitter.com.
+    You’ll need to add \e http://localhost:1337/callback as a callback URL
+    in your Twitter app settings.
 
     \include examples-run.qdocinc
 */
diff --git a/examples/oauth/twittertimeline/twitter.cpp b/examples/oauth/twittertimeline/twitter.cpp
index ddc174b..8529537 100644
--- a/examples/oauth/twittertimeline/twitter.cpp
+++ b/examples/oauth/twittertimeline/twitter.cpp
@@ -67,7 +67,7 @@ Twitter::Twitter(const QString &screenName,
                  QObject *parent) :
     QOAuth1(clientCredentials.first, clientCredentials.second, nullptr, parent)
 {
-    replyHandler = new QOAuthHttpServerReplyHandler(this);
+    replyHandler = new QOAuthHttpServerReplyHandler(1337, this);
     replyHandler->setCallbackPath("callback");
     setReplyHandler(replyHandler);
     setTemporaryCredentialsUrl(QUrl("https://api.twitter.com/oauth/request_token"));