summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-06-27 14:38:03 +0200
committerLiang Qi <liang.qi@qt.io>2019-06-27 14:38:03 +0200
commit25eb97d2d450fbfe761559f1ae87a2e88c8c6b2d (patch)
treea96380908abb944ff374201321fa5a50d15b770a /src/concurrent
parentfc940b24dbe8a118e92e335c0d9c7d4194bf3d4f (diff)
parent0d6b4b519272915c2690ee12d1834823747233ab (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: .qmake.conf src/network/ssl/qsslsocket_openssl.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024
Diffstat (limited to 'src/concurrent')
-rw-r--r--src/concurrent/doc/qtconcurrent.qdocconf1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf
index 356d602a7c..610dca2a7e 100644
--- a/src/concurrent/doc/qtconcurrent.qdocconf
+++ b/src/concurrent/doc/qtconcurrent.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtbase.qdocconf)
project = QtConcurrent
description = Qt Concurrent Reference Documentation