Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1

Change-Id: I66dc4717f21c717adefac63bb8bdbf322e00bbf5

2 files changed, 30 insertions, 3 deletions

diff --git a/dist/changes-5.12.1 b/dist/changes-5.12.1
new file mode 100644
index 0000000..164d000
--- /dev/null
+++ b/dist/changes-5.12.1
@@ -0,0 +1,24 @@
+Qt 5.12.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+ - Use 127.0.0.1 in place of localhost for redirect URI following RFC 8252.
diff --git a/examples/oauth/oauth.pro b/examples/oauth/oauth.pro
index 6124292..abac296 100644
--- a/examples/oauth/oauth.pro
+++ b/examples/oauth/oauth.pro
@@ -1,4 +1,7 @@
 TEMPLATE = subdirs
-SUBDIRS += \
-    twittertimeline \
-    redditclient
+
+qtHaveModule(widgets) {
+    SUBDIRS += \
+        twittertimeline \
+        redditclient
+}