summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-13 13:11:15 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-13 13:11:15 +0100
commit1d37d5b362779326abd0cbf31ac2494842bea11c (patch)
treec8a102debfed606c307f721e0a87dd78b7873df4
parenta9a4e64127a06ca9d1ad7032e521a1181e0412f6 (diff)
parentbcc86311359e138ecc3a8fc1ce6eee1cda2ec0f5 (diff)
downloadqtx11extras-1d37d5b362779326abd0cbf31ac2494842bea11c.tar.gz
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Id4f88960be38e50cbc5d3cc18e217eef183e0238
-rw-r--r--src/x11extras/doc/qtx11extras.qdocconf2
-rw-r--r--src/x11extras/doc/src/qtx11extras-index.qdoc2
-rw-r--r--src/x11extras/doc/src/qtx11extras-module.qdoc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/x11extras/doc/qtx11extras.qdocconf b/src/x11extras/doc/qtx11extras.qdocconf
index c949981..8f0e704 100644
--- a/src/x11extras/doc/qtx11extras.qdocconf
+++ b/src/x11extras/doc/qtx11extras.qdocconf
@@ -22,7 +22,7 @@ qhp.QtX11Extras.subprojects.classes.indexTitle = Qt X11 Extras C++ Classes
qhp.QtX11Extras.subprojects.classes.selectors = class fake:headerfile
qhp.QtX11Extras.subprojects.classes.sortPages = true
-depends += qtcore qtwidgets qtdoc
+depends += qtcore qtwidgets qtdoc qmake
headerdirs += ..
diff --git a/src/x11extras/doc/src/qtx11extras-index.qdoc b/src/x11extras/doc/src/qtx11extras-index.qdoc
index 416df18..f2ef5c3 100644
--- a/src/x11extras/doc/src/qtx11extras-index.qdoc
+++ b/src/x11extras/doc/src/qtx11extras-index.qdoc
@@ -43,7 +43,7 @@
#include <QX11Info>
\endcode
- To link against the module, add this line to your \l qmake \c
+ To link against the module, add this line to your \l {qmake Manual}{qmake} \c
.pro file:
\code
diff --git a/src/x11extras/doc/src/qtx11extras-module.qdoc b/src/x11extras/doc/src/qtx11extras-module.qdoc
index b2ad2eb..b7cbf64 100644
--- a/src/x11extras/doc/src/qtx11extras-module.qdoc
+++ b/src/x11extras/doc/src/qtx11extras-module.qdoc
@@ -40,7 +40,7 @@
#include <QX11Info>
\endcode
- To link against the module, add this line to your \l qmake \c
+ To link against the module, add this line to your \l {qmake Manual}{qmake} \c
.pro file:
\code