diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/linguist/Qt5LinguistToolsMacros.cmake | 2 | ||||
| -rw-r--r-- | src/macdeployqt/shared/shared.h | 2 | ||||
| -rw-r--r-- | src/qdoc/doc/qdoc-manual-qdocconf.qdoc | 4 | ||||
| -rw-r--r-- | src/qdoc/doc/qtgui-qdocconf.qdoc | 18 | ||||
| -rw-r--r-- | src/qdoc/htmlgenerator.cpp | 6 | ||||
| -rw-r--r-- | src/qdoc/sections.cpp | 6 |
6 files changed, 9 insertions, 29 deletions
diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake index 20fb14935..ab1534144 100644 --- a/src/linguist/Qt5LinguistToolsMacros.cmake +++ b/src/linguist/Qt5LinguistToolsMacros.cmake @@ -47,7 +47,7 @@ function(QT5_CREATE_TRANSLATION _qm_files) list(GET _lupdate_options ${_extensions_index} _extensions_list) string(REPLACE "," ";" _extensions_list "${_extensions_list}") list(TRANSFORM _extensions_list STRIP) - list(TRANSFORM _extensions_list REPLACE "^\." "") + list(TRANSFORM _extensions_list REPLACE "^\\." "") list(TRANSFORM _extensions_list PREPEND "*.") else() set(_extensions_list "*.java;*.jui;*.ui;*.c;*.c++;*.cc;*.cpp;*.cxx;*.ch;*.h;*.h++;*.hh;*.hpp;*.hxx;*.js;*.qs;*.qml;*.qrc") diff --git a/src/macdeployqt/shared/shared.h b/src/macdeployqt/shared/shared.h index ab28360d5..9785d8cbc 100644 --- a/src/macdeployqt/shared/shared.h +++ b/src/macdeployqt/shared/shared.h @@ -62,7 +62,7 @@ public: bool isDebugLibrary() const { - return binaryName.contains(QLatin1String("_debug")); + return binaryName.endsWith(QStringLiteral("_debug")); } }; diff --git a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc index ef92cc99e..f0efb33ce 100644 --- a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc +++ b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc @@ -1365,10 +1365,6 @@ qhp.QtQuick.indexTitle = Qt Quick qhp.QtQuick.indexRoot = - qhp.QtQuick.filterAttributes = qtquick $QT_VERSION qtrefdoc - qhp.QtQuick.customFilters.Qt.name = QtQuick $QT_VERSION - qhp.QtQuick.customFilters.Qt.filterAttributes = qtquick $QT_VERSION - qhp.QtQuick.subprojects = qmltypes classes examples qhp.QtQuick.subprojects.qmltypes.title = QML Types diff --git a/src/qdoc/doc/qtgui-qdocconf.qdoc b/src/qdoc/doc/qtgui-qdocconf.qdoc index 89c46ff94..8602326bb 100644 --- a/src/qdoc/doc/qtgui-qdocconf.qdoc +++ b/src/qdoc/doc/qtgui-qdocconf.qdoc @@ -56,10 +56,6 @@ every statement in the qdocconf file. qhp.QtGui.indexTitle = Qt GUI qhp.QtGui.indexRoot = - qhp.QtGui.filterAttributes = qtgui $QT_VERSION qtrefdoc - qhp.QtGui.customFilters.Qt.name = Qtgui $QT_VERSION - qhp.QtGui.customFilters.Qt.filterAttributes = qtgui $QT_VERSION - qhp.QtGui.subprojects = classes qhp.QtGui.subprojects.classes.title = C++ Classes qhp.QtGui.subprojects.classes.indexTitle = Qt GUI C++ Classes @@ -199,20 +195,6 @@ Specifies the title of the root (namespace) page to generate the documentation f Typically defined as an empty string. \badcode - qhp.QtGui.filterAttributes = qtgui $QT_VERSION qtrefdoc - qhp.QtGui.customFilters.Qt.name = QtGui $QT_VERSION - qhp.QtGui.customFilters.Qt.filterAttributes = qtgui $QT_VERSION -\endcode - -The documentation set (one per QDoc project) can have any number of filter -attributes assigned to it. A filter attribute is an ordinary string which -can be freely chosen. Additionally, custom filters that reference above -attributes can be defined. Qt Assistant will display the name of the custom -filter in its \gui{Filtered by} drop-down list. Only the documentation sets -that have their filter attributes match the attributes of the selected -custom filter will be shown. - -\badcode qhp.QtGui.subprojects = classes qhp.QtGui.subprojects.classes.title = C++ Classes qhp.QtGui.subprojects.classes.indexTitle = Qt GUI C++ Classes diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index aaea6a65f..d78877ea6 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -661,7 +661,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark if (relative->isExample()) { qDebug() << "GENERATE FILE LIST CALLED" << relative->name() << atom->string(); } else - relative->location().warning(QString("'\\generatelist \1' can only be used with " + relative->location().warning(QString("'\\generatelist %1' can only be used with " "'\\example' topic command") .arg(atom->string())); } else if (atom->string() == QLatin1String("classhierarchy")) { @@ -699,10 +699,10 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark if (cn) { if (!generateGroupList(const_cast<CollectionNode *>(cn))) relative->location().warning( - QString("'\\generatelist \1' group is empty").arg(atom->string())); + QString("'\\generatelist %1' group is empty").arg(atom->string())); } else { relative->location().warning( - QString("'\\generatelist \1' no such group").arg(atom->string())); + QString("'\\generatelist %1' no such group").arg(atom->string())); } } break; diff --git a/src/qdoc/sections.cpp b/src/qdoc/sections.cpp index 00357c246..08594abf4 100644 --- a/src/qdoc/sections.cpp +++ b/src/qdoc/sections.cpp @@ -283,9 +283,7 @@ void Section::reduce() { if (!isEmpty()) { keys_ = memberMap_.keys(); - obsoleteKeys_ = obsoleteMemberMap_.keys(); members_ = memberMap_.values().toVector(); - obsoleteMembers_ = obsoleteMemberMap_.values().toVector(); reimplementedMembers_ = reimplementedMemberMap_.values().toVector(); for (int i = 0; i < classMapList_.size(); i++) { ClassMap *cm = classMapList_[i]; @@ -296,6 +294,10 @@ void Section::reduce() classKeysNodesList_.append(ckn); } } + if (!obsoleteMemberMap_.isEmpty()) { + obsoleteKeys_ = obsoleteMemberMap_.keys(); + obsoleteMembers_ = obsoleteMemberMap_.values().toVector(); + } } /*! |