diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:00 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:01 +0100 |
commit | 7b775f51f574a4875be414e636d82c325810dd02 (patch) | |
tree | 2432012a55c95d2978f664c8aaf453a91dc1ee31 | |
parent | 936ae1fdd4634e7ace7ef0f1358185158adc9c59 (diff) | |
parent | 779002b14dc2e9e4eb22f2c2c243f3da12fa4c72 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I9069b01eb82dfcce33e2afae3be853f7a5bd1fa8
-rw-r--r-- | src/assistant/assistant/doc/src/assistant-quick-guide.qdoc | 10 | ||||
-rw-r--r-- | src/assistant/assistant/preferencesdialog.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/connectionedit.cpp | 8 | ||||
-rw-r--r-- | src/designer/src/lib/shared/qtresourcemodel.cpp | 4 | ||||
-rw-r--r-- | src/designer/src/lib/shared/qtresourceview.cpp | 7 | ||||
-rw-r--r-- | src/windeployqt/main.cpp | 19 |
6 files changed, 29 insertions, 21 deletions
diff --git a/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc b/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc index 66f0a7222..28590fa25 100644 --- a/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc +++ b/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/assistant/assistant/preferencesdialog.cpp b/src/assistant/assistant/preferencesdialog.cpp index 963b61596..4652d0187 100644 --- a/src/assistant/assistant/preferencesdialog.cpp +++ b/src/assistant/assistant/preferencesdialog.cpp @@ -251,7 +251,7 @@ void PreferencesDialog::updateFilterPage() for (const QString &a : helpEngine.filterAttributes()) new QTreeWidgetItem(m_ui.attributeWidget, QStringList() << a); - if (!m_filterMap.keys().isEmpty()) + if (!m_filterMap.isEmpty()) m_ui.filterWidget->setCurrentRow(0); } diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp index 8f3b12ab2..219774113 100644 --- a/src/designer/src/lib/shared/connectionedit.cpp +++ b/src/designer/src/lib/shared/connectionedit.cpp @@ -1194,12 +1194,10 @@ void ConnectionEdit::mouseDoubleClickEvent(QMouseEvent *e) case Dragging: break; case Editing: - if (!m_widget_under_mouse.isNull()) { + if (!m_widget_under_mouse.isNull()) emit widgetActivated(m_widget_under_mouse); - } else if (m_sel_con_set.size() == 1) { - Connection *con = m_sel_con_set.keys().first(); - modifyConnection(con); - } + else if (m_sel_con_set.size() == 1) + modifyConnection(m_sel_con_set.constBegin().key()); break; } diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp index 92c15cd36..4b08f3670 100644 --- a/src/designer/src/lib/shared/qtresourcemodel.cpp +++ b/src/designer/src/lib/shared/qtresourcemodel.cpp @@ -473,7 +473,7 @@ QStringList QtResourceModel::loadedQrcFiles() const bool QtResourceModel::isModified(const QString &path) const { - QMap<QString, bool>::const_iterator it = d_ptr->m_pathToModified.find(path); + QMap<QString, bool>::const_iterator it = d_ptr->m_pathToModified.constFind(path); if (it != d_ptr->m_pathToModified.constEnd()) return it.value(); return true; @@ -481,7 +481,7 @@ bool QtResourceModel::isModified(const QString &path) const void QtResourceModel::setModified(const QString &path) { - QMap<QString, bool>::const_iterator itMod = d_ptr->m_pathToModified.find(path); + QMap<QString, bool>::const_iterator itMod = d_ptr->m_pathToModified.constFind(path); if (itMod == d_ptr->m_pathToModified.constEnd()) return; diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index a64b99000..00a656410 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -658,13 +658,14 @@ void QtResourceView::selectResource(const QString &resource) if (fi.isDir()) dir = QDir(resource); QString dirPath = dir.absolutePath(); - QMap<QString, QTreeWidgetItem *>::const_iterator it; - while ((it = d_ptr->m_pathToItem.find(dirPath)) == d_ptr->m_pathToItem.constEnd()) { + const auto cend = d_ptr->m_pathToItem.constEnd(); + auto it = cend; + while ((it = d_ptr->m_pathToItem.constFind(dirPath)) == cend) { if (!dir.cdUp()) break; dirPath = dir.absolutePath(); } - if (it != d_ptr->m_pathToItem.constEnd()) { + if (it != cend) { QTreeWidgetItem *treeItem = it.value(); d_ptr->m_treeWidget->setCurrentItem(treeItem); d_ptr->m_treeWidget->scrollToItem(treeItem); diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index ba61b2c3c..3ca83ca44 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -953,7 +953,8 @@ static QStringList translationNameFilters(quint64 modules, const QString &prefix } static bool deployTranslations(const QString &sourcePath, quint64 usedQtModules, - const QString &target, unsigned flags, QString *errorMessage) + const QString &target, const Options &options, + QString *errorMessage) { // Find available languages prefixes by checking on qtbase. QStringList prefixes; @@ -979,14 +980,22 @@ static bool deployTranslations(const QString &sourcePath, quint64 usedQtModules, arguments.clear(); const QString targetFile = QStringLiteral("qt_") + prefix + QStringLiteral(".qm"); arguments.append(QStringLiteral("-o")); - arguments.append(QDir::toNativeSeparators(absoluteTarget + QLatin1Char('/') + targetFile)); + const QString targetFilePath = absoluteTarget + QLatin1Char('/') + targetFile; + if (options.json) + options.json->addFile(sourcePath + QLatin1Char('/') + targetFile, targetFilePath); + arguments.append(QDir::toNativeSeparators(targetFilePath)); const QFileInfoList &langQmFiles = sourceDir.entryInfoList(translationNameFilters(usedQtModules, prefix)); - for (const QFileInfo &langQmFileFi : langQmFiles) + for (const QFileInfo &langQmFileFi : langQmFiles) { + if (options.json) { + options.json->addFile(langQmFileFi.absoluteFilePath(), + absoluteTarget + QLatin1Char('/') + langQmFileFi.fileName()); + } arguments.append(langQmFileFi.fileName()); + } if (optVerboseLevel) std::wcout << "Creating " << targetFile << "...\n"; unsigned long exitCode; - if (!(flags & SkipUpdateFile) + if ((options.updateFileFlags & SkipUpdateFile) == 0 && (!runProcess(binary, arguments, sourcePath, &exitCode, 0, 0, errorMessage) || exitCode)) { return false; } @@ -1525,7 +1534,7 @@ static DeployResult deploy(const Options &options, return result; if (!deployTranslations(qmakeVariables.value(QStringLiteral("QT_INSTALL_TRANSLATIONS")), result.deployedQtLibraries, options.translationsDirectory, - options.updateFileFlags, errorMessage)) { + options, errorMessage)) { return result; } } |