summaryrefslogtreecommitdiff
path: root/src/x11extras/qx11info_x11.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-29 14:19:43 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-29 14:19:43 +0200
commitbe0436b2c728e84cd574a9819872336a7fc04121 (patch)
treee08cdfc49ed05976d4cd35a32170c0ebc00a4850 /src/x11extras/qx11info_x11.cpp
parent29028096c71dc8a193a35baa46219aa5def315e5 (diff)
parenta03d4ddf0a8eda87e6a9043259f224a03d4bc68c (diff)
downloadqtx11extras-be0436b2c728e84cd574a9819872336a7fc04121.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I63c17e85c104c7a01abd351a8fd80a194f16691c
Diffstat (limited to 'src/x11extras/qx11info_x11.cpp')
-rw-r--r--src/x11extras/qx11info_x11.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/x11extras/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index a7499e4..aa35ff1 100644
--- a/src/x11extras/qx11info_x11.cpp
+++ b/src/x11extras/qx11info_x11.cpp
@@ -62,8 +62,9 @@ QT_BEGIN_NAMESPACE
/*!
\class QX11Info
- \brief The QX11Info class provides information about the X display
- configuration.
+ \inmodule QtX11Extras
+ \since 5.1
+ \brief Provides information about the X display configuration.
The class provides two APIs: a set of non-static functions that
provide information about a specific widget or pixmap, and a set