aboutsummaryrefslogtreecommitdiffstats
path: root/doc/doc.pri
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-03-22 08:30:27 +0100
committerJoerg Bornemann <joerg.bornemann@digia.com>2013-03-25 15:11:52 +0100
commit77b1c2d2e9497501473fa1992ce6bac9b036698e (patch)
tree2e6fe3436689b77f85d2657e7d7512ee36ddc47d /doc/doc.pri
parentfed4549db56f20f2e3521bc51495f372e7efb7a3 (diff)
Doc: cleanup Qt4 compatibility file
Use Qt4 compatibility macros and aliases only in the Qt4 version of the docs. Rename compat.qdocconf to compat-qt4.qdocconf to indicate that this is for Qt4 compatibility only. This fixes a bunch of warnings when generating the documentation with Qt5. Change-Id: If051a0c6b01304c872c501d5eff558641c459d1a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'doc/doc.pri')
-rw-r--r--doc/doc.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index e37f13432..c3515e4f9 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -36,7 +36,7 @@ QHP_FILE = $$OUT_PWD/doc/html/qbs.qhp
QCH_FILE = $$OUT_PWD/doc/qbs.qch
HELP_DEP_FILES = $$PWD/qbs.qdoc \
- $$PWD/config/compat.qdocconf \
+ $$PWD/config/compat-qt4.qdocconf \
$$PWD/config/macros.qdocconf \
$$PWD/config/qt-cpp-ignore.qdocconf \
$$PWD/config/qt-html-templates.qdocconf \