diff options
| author | Nico Vertriest <nico.vertriest@qt.io> | 2018-12-05 15:20:57 +0100 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@qt.io> | 2019-01-03 09:45:23 +0000 |
| commit | 651b4845de69e04e54285dac42430d0ae4b5fe02 (patch) | |
| tree | 941073acede66b52fd36390024ba002d99531295 | |
| parent | 29ea287716175b57aa7b050b70eb3eb5c9049464 (diff) | |
Doc: Fix linking errors qtbase
Change-Id: I225e59bea0a8eac14fd11ef2b091907ae955c447
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | src/network/ssl/qpassworddigestor.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/qtestevent.qdoc | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/network/ssl/qpassworddigestor.cpp b/src/network/ssl/qpassworddigestor.cpp index 127d94e849..706fa1de05 100644 --- a/src/network/ssl/qpassworddigestor.cpp +++ b/src/network/ssl/qpassworddigestor.cpp @@ -75,7 +75,7 @@ namespace QPasswordDigestor { \a salt must always be 8 bytes long! \note This function is provided for use with legacy applications and all - new applications are recommended to use \l {pbkdf2} {PBKDF2}. + new applications are recommended to use \l {deriveKeyPbkdf2} {PBKDF2}. \sa deriveKeyPbkdf2, QCryptographicHash, QCryptographicHash::hashLength */ diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index dbe7353bbe..2b0ad52b2d 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2419,7 +2419,7 @@ bool QTest::currentTestFailed() Sleeps for \a ms milliseconds, blocking execution of the test. qSleep() will not do any event processing and leave your test unresponsive. Network communication might time out while - sleeping. Use \l qWait() to do non-blocking sleeping. + sleeping. Use \l {QTest::qWait()} to do non-blocking sleeping. \a ms must be greater than 0. @@ -2430,7 +2430,7 @@ bool QTest::currentTestFailed() Example: \snippet code/src_qtestlib_qtestcase.cpp 23 - \sa qWait() + \sa {QTest::qWait()} */ void QTest::qSleep(int ms) { diff --git a/src/testlib/qtestevent.qdoc b/src/testlib/qtestevent.qdoc index f0d3bff162..af84f2ac2b 100644 --- a/src/testlib/qtestevent.qdoc +++ b/src/testlib/qtestevent.qdoc @@ -133,7 +133,7 @@ Adds a \a msecs milliseconds delay. - \sa QTest::qWait() + \sa {QTest::qWait()} */ /*! \fn void QTestEventList::simulate(QWidget *w) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index bcfae46155..9a07c55e10 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -4495,7 +4495,7 @@ void QWidget::setForegroundRole(QPalette::ColorRole role) the "color", "background-color", "selection-color", "selection-background-color" and "alternate-background-color". - \sa QApplication::palette(), QWidget::font(), \l {Qt Style Sheets} + \sa QApplication::palette(), QWidget::font(), {Qt Style Sheets} */ const QPalette &QWidget::palette() const { |