summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2017-04-18 13:21:26 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2017-04-18 12:57:45 +0000
commit84fb8c5ec909fa29512236aed3a77f595a2ac891 (patch)
treecb99bba91f1a3c9ec3965af2ad0efe9f79989830 /src/gui
parentdb2de20c59137eab15fac9592c001a4d234c82d4 (diff)
Doc: Remove broken link to QWindowSystemInterface::registerTouchDevice()
Mention that it is a private function. Also mention using QTest::createTouchDevice() for adding simulated touch screens to autotests. Task-number: QTBUG-26647 Change-Id: I08c12225768e76b1b9e3fc0fda00af86d44ca766 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Bo Thorsen <bo@vikingsoft.eu> Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/doc/qtgui.qdocconf3
-rw-r--r--src/gui/kernel/qtouchdevice.cpp5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index 94574a314c..bac93af775 100644
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -39,7 +39,8 @@ depends += \
qtquick \
qtwidgets \
qtdoc \
- qmake
+ qmake \
+ qttestlib
headerdirs += ..
diff --git a/src/gui/kernel/qtouchdevice.cpp b/src/gui/kernel/qtouchdevice.cpp
index 97cc8d179d..0f13412fb1 100644
--- a/src/gui/kernel/qtouchdevice.cpp
+++ b/src/gui/kernel/qtouchdevice.cpp
@@ -215,7 +215,10 @@ static void cleanupDevicesList()
/*!
Returns a list of all registered devices.
- \note The returned list cannot be used to add new devices. Use QWindowSystemInterface::registerTouchDevice() instead.
+ \note The returned list cannot be used to add new devices. To add a simulated
+ touch screen for an autotest, QTest::createTouchDevice() can be used.
+ To add real touch screens to QPA plugins, the private
+ \c QWindowSystemInterface::registerTouchDevice() function can be used.
*/
QList<const QTouchDevice *> QTouchDevice::devices()
{