diff options
Diffstat (limited to 'doc/global')
| -rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 4 | ||||
| -rw-r--r-- | doc/global/qt-cpp-defines.qdocconf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index e70a441495..8e7508f094 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -107,10 +107,6 @@ */ /*! - \externalpage http://wiki.qt.io/BlackBerry - \title Qt for BlackBerry -*/ -/*! \externalpage http://wiki.qt.io/Qt_Multimedia_Backends \title Qt Multimedia Backends */ diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 967bbb8ede..54d2cbbe4e 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -161,3 +161,7 @@ Cpp.ignoredirectives += \ QT_WARNING_DISABLE_MSVC \ Q_ATTRIBUTE_FORMAT_PRINTF \ Q_MV_IOS + +# Qt 6: Remove +falsehoods += \ + "QT_VERSION >= QT_VERSION_CHECK\\(6,0,0\\)" |