diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:06:05 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:06:56 +0100 |
| commit | c0bfa2a930f6414d41684e578b59872defdffdf9 (patch) | |
| tree | c5efa3b1da910b82fd6c89b6187102fdc5503da7 | |
| parent | 359dad818d450c015753a822a12ebd1ecbabad34 (diff) | |
| parent | 99235a6262fd773ec845b8aea8f770dc62b50db5 (diff) | |
| download | qttools-c0bfa2a930f6414d41684e578b59872defdffdf9.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
Change-Id: I83e2382427eb4a8ee0d52d3c4f379242ef80e09e
| -rw-r--r-- | src/designer/src/designer/versiondialog.cpp | 2 | ||||
| -rw-r--r-- | src/linguist/linguist/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/qdbus/qdbusviewer/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/qdoc/doc/qdoc-manual-markupcmds.qdoc | 2 | ||||
| -rw-r--r-- | src/qdoc/doc/qdoc-manual-qdocconf.qdoc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp index ed0f8d862..908ffd99e 100644 --- a/src/designer/src/designer/versiondialog.cpp +++ b/src/designer/src/designer/versiondialog.cpp @@ -160,7 +160,7 @@ VersionDialog::VersionDialog(QWidget *parent) lbl->setText(tr("%1" "<br/>Copyright (C) %2 The Qt Company Ltd." - ).arg(version, QStringLiteral("2017"))); + ).arg(version, QStringLiteral("2018"))); lbl->setWordWrap(true); lbl->setOpenExternalLinks(true); diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index 92aed394e..731ce44eb 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -1355,7 +1355,7 @@ void MainWindow::about() "<p>Qt Linguist is a tool for adding translations to Qt " "applications.</p>" "<p>Copyright (C) %2 The Qt Company Ltd." - ).arg(version, QStringLiteral("2017"))); + ).arg(version, QStringLiteral("2018"))); box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist")); box.setIcon(QMessageBox::NoIcon); diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp index 454a605a6..4f4484581 100644 --- a/src/qdbus/qdbusviewer/mainwindow.cpp +++ b/src/qdbus/qdbusviewer/mainwindow.cpp @@ -90,7 +90,7 @@ void MainWindow::about() "<h3>%1</h3>" "<p>Version %2</p></center>" "<p>Copyright (C) %3 The Qt Company Ltd.</p>") - .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2017"))); + .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2018"))); box.setWindowTitle(tr("D-Bus Viewer")); box.exec(); } diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc index 10504d968..618e5cc54 100644 --- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -3916,7 +3916,7 @@ <author>Qt Development Frameworks</author> <publisher>Qt Project</publisher> <copyright> - <copyryear year="2017"/> + <copyryear year="2018"/> <copyrholder>Qt Project</copyrholder> </copyright> <permissions view="all"/> diff --git a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc index cc8be05d5..a75ccb474 100644 --- a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc +++ b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc @@ -1839,7 +1839,7 @@ dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Qt Project - dita.metadata.default.copyryear = 2017 + dita.metadata.default.copyryear = 2018 dita.metadata.default.copyrholder = Qt Project dita.metadata.default.audience = programmer \endcode |