diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:00:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:00:46 +0100 |
| commit | b69e287c2166debf2ad7537b521daa205d36087c (patch) | |
| tree | 4149bc9f7d6a7fe6cf9375dbc8b748266436cdce | |
| parent | 8c52e3f6e8ad97f818db189a5834c73f55c283f7 (diff) | |
| parent | 85e0d04e21d2f47eaa0b31c26ee4e04712d523db (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ice7fd57f472abbc3256202295c5e9dd496d79df3
| -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) |