diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/config.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 2 | ||||
| -rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 4 | ||||
| -rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf index 97357345c9..ac9e7ac274 100644 --- a/doc/global/config.qdocconf +++ b/doc/global/config.qdocconf @@ -10,6 +10,6 @@ dita.metadata.default.audience = programmer #Set the main Qt index.html navigation.homepage = "Qt $QT_VER" -sourcedirs += includes +sourcedirs += includes $$BUILDDIR url = http://doc.qt.io/qt-5 diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index b231bb1f4a..d9859ba295 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -474,7 +474,7 @@ */ /*! - \externalpage http://git.iksaif.net/?p=qsslkey-p11.git + \externalpage https://github.com/iksaif/qsslkey-p11 \title qsslkey example */ diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index 5eea92c601..f17f85da9f 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -37,6 +37,10 @@ \title Downloads */ /*! + \externalpage http://www.qt.io/about-us/ + \title The Qt Company +*/ +/*! \externalpage http://qt.io/licensing/ \title Qt Licensing Overview */ diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 54d2cbbe4e..fe8b7fb87e 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -7,7 +7,6 @@ defines += Q_QDOC \ QT_KEYPAD_NAVIGATION \ QT_NO_EGL \ QT3_SUPPORT \ - Q_DEAD_CODE_FROM_QT4_.* \ Q_OS_.* \ Q_BYTE_ORDER \ QT_DEPRECATED \ @@ -68,6 +67,7 @@ Cpp.ignoretokens += \ Q_LOCATION_EXPORT \ Q_POSITIONING_EXPORT \ Q_MULTIMEDIA_EXPORT \ + Q_NAMESPACE \ Q_NETWORK_EXPORT \ Q_NEVER_INLINE \ Q_NORETURN \ |