diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-11-07 12:23:00 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-11-14 12:34:19 +0000 |
| commit | 25017be3e97f0af3ad3882a54bb4e625762bff9c (patch) | |
| tree | 28f8f46f28de7c5d25ae2a352c36ce697e137c5b | |
| parent | f929c8d9c63bdef5a196cf44776ac89f555f21db (diff) | |
Doc: Get rid of QT_INSTALL_HEADERS in documentation config
The use of QT_INSTALL_HEADERS caused documentation build failures
in certain configurations. Use an alternative method to pass the
required include paths to QDoc; add doc.pro and make 'doc' a proper
subproject.
Also fix the remaining documentation warnings.
Task-number: QTBUG-67925
Change-Id: I68ce63bcac4ab7f70468535fe53057f51525ca2e
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/doc/doc.pro | 10 | ||||
| -rw-r--r-- | src/doc/qtspeech.qdocconf | 4 | ||||
| -rw-r--r-- | src/src.pro | 5 | ||||
| -rw-r--r-- | src/tts/qvoice.cpp | 4 |
4 files changed, 14 insertions, 9 deletions
diff --git a/src/doc/doc.pro b/src/doc/doc.pro new file mode 100644 index 0000000..b6168b6 --- /dev/null +++ b/src/doc/doc.pro @@ -0,0 +1,10 @@ +TEMPLATE = aux + +CONFIG += force_qt +QT += core-private + +QMAKE_DOCS = $$PWD/qtspeech.qdocconf + +OTHER_FILES += \ + $$PWD/src/*.qdoc \ + $$PWD/QtSpeechDoc diff --git a/src/doc/qtspeech.qdocconf b/src/doc/qtspeech.qdocconf index 4259272..b77de7e 100644 --- a/src/doc/qtspeech.qdocconf +++ b/src/doc/qtspeech.qdocconf @@ -14,9 +14,7 @@ exampledirs += \ moduleheader = QtSpeechDoc -includepaths = -I . \ - -I $QT_INSTALL_HEADERS \ - -I $QT_INSTALL_HEADERS/QtCore +includepaths = -I . examplesinstallpath = speech diff --git a/src/src.pro b/src/src.pro index f79ef8e..16ec641 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,8 +1,5 @@ TEMPLATE = subdirs -QMAKE_DOCS = $$PWD/doc/qtspeech.qdocconf -load(qt_docs) - -SUBDIRS = tts plugins +SUBDIRS = tts plugins doc plugins.depends = tts diff --git a/src/tts/qvoice.cpp b/src/tts/qvoice.cpp index 2c19aff..5eb2984 100644 --- a/src/tts/qvoice.cpp +++ b/src/tts/qvoice.cpp @@ -98,7 +98,7 @@ void QVoice::operator=(const QVoice &other) } /*! - Compares the \l name, \l gender, and \l age of this voice with \l other. + Compares the \l name, \l gender, and \l age of this voice with \a other. Returns \c true if all of them match. */ bool QVoice::operator==(const QVoice &other) @@ -112,7 +112,7 @@ bool QVoice::operator==(const QVoice &other) } /*! - Compares the \l name, \l gender, and \l age of this voice with \l other. + Compares the \l name, \l gender, and \l age of this voice with \a other. Returns \c true if they are not identical. */ bool QVoice::operator!=(const QVoice &other) |