diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/linguist/linguist/mainwindow.cpp | 6 | ||||
-rw-r--r-- | src/linguist/shared/qm.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/helpprojectwriter.cpp | 4 | ||||
-rw-r--r-- | src/qdoc/webxmlgenerator.cpp | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/.qmake.conf b/.qmake.conf index 055617036..7dc754c78 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.3 +MODULE_VERSION = 5.15.4 diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index 468c49d1d..52b8044f6 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -1305,9 +1305,9 @@ void MainWindow::addToPhraseBook() return; } else { bool okPressed = false; - QString selectedPhraseBook = QInputDialog::getItem(this, tr("Add to phrase book"), - tr("Select phrase book to add to"), - phraseBookList, 0, false, &okPressed); + selectedPhraseBook = QInputDialog::getItem(this, tr("Add to phrase book"), + tr("Select phrase book to add to"), + phraseBookList, 0, false, &okPressed); if (!okPressed) return; } diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp index 288607824..8c3fc3faf 100644 --- a/src/linguist/shared/qm.cpp +++ b/src/linguist/shared/qm.cpp @@ -552,7 +552,7 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd) goto end; case Tag_Translation: { int len = read32(m); - if (len % 1) { + if (len & 1) { cd.appendError(QLatin1String("QM-Format error")); return false; } diff --git a/src/qdoc/helpprojectwriter.cpp b/src/qdoc/helpprojectwriter.cpp index c534d399b..37d048b7a 100644 --- a/src/qdoc/helpprojectwriter.cpp +++ b/src/qdoc/helpprojectwriter.cpp @@ -657,7 +657,9 @@ void HelpProjectWriter::generateProject(HelpProject &project) writer.writeStartElement("toc"); writer.writeStartElement("section"); const Node *node = qdb_->findPageNodeByTitle(project.indexTitle); - if (node == nullptr) + if (!node) + node = qdb_->findNodeByNameAndType(QStringList(project.indexTitle), &Node::isPageNode); + if (!node) node = qdb_->findNodeByNameAndType(QStringList("index.html"), &Node::isPageNode); QString indexPath; if (node) diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp index 4d8906f6a..59e83b1b0 100644 --- a/src/qdoc/webxmlgenerator.cpp +++ b/src/qdoc/webxmlgenerator.cpp @@ -748,7 +748,7 @@ void WebXMLGenerator::startLink(QXmlStreamWriter &writer, const Atom *atom, cons fullName = node->fullName(); if (!fullName.isEmpty() && !link.isEmpty()) { writer.writeStartElement("link"); - if (!atom->string().isEmpty()) + if (atom && !atom->string().isEmpty()) writer.writeAttribute("raw", atom->string()); else writer.writeAttribute("raw", fullName); |