diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:59:14 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:59:14 +0100 |
| commit | 85e94c254a7205ac3e64379f34ca312a6b702234 (patch) | |
| tree | 8e47330b59ed5c7a2c04c41ad508ed5469d5349b /src/qdbus | |
| parent | d1e639a800a105f4611c87f024664559c7d33aaa (diff) | |
| parent | 638c278b76c56a51f83ef8c5cc9c03f18a887f74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
LICENSE.LGPLv21
LICENSE.LGPLv3
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/versiondialog.cpp
src/linguist/linguist/mainwindow.cpp
src/linguist/lrelease/lrelease.1
src/linguist/lupdate/lupdate.1
src/qconfig/main.cpp
src/qdbus/qdbusviewer/mainwindow.cpp
Change-Id: I8644f68ff02f00a377f82ea0b7520aa308f0a0df
Diffstat (limited to 'src/qdbus')
| -rw-r--r-- | src/qdbus/qdbusviewer/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp index 456c1448d..e3d0aa193 100644 --- a/src/qdbus/qdbusviewer/mainwindow.cpp +++ b/src/qdbus/qdbusviewer/mainwindow.cpp @@ -95,7 +95,7 @@ void MainWindow::about() "<h3>%1</h3>" "<p>Version %2</p></center>" "<p>Copyright (C) %3 Digia Plc and/or its subsidiary(-ies).</p>") - .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2014"))); + .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2015"))); box.setWindowTitle(tr("D-Bus Viewer")); box.exec(); } |