diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-20 11:24:25 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-20 11:24:25 (GMT) |
| commit | 1ee923a21c270094203c5d2a861a8015598ceda1 (patch) | |
| tree | d53b292eabb1fc565840153d8f5efb3c3b2afd52 /tools/qdbus/qdbusviewer/qdbusviewer.cpp | |
| parent | 4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed (diff) | |
| parent | 691e83425ac5883922837bc5fd1efb5385db9871 (diff) | |
| download | Qt-1ee923a21c270094203c5d2a861a8015598ceda1.zip Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.gz Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/stylesheet.qdoc
Diffstat (limited to 'tools/qdbus/qdbusviewer/qdbusviewer.cpp')
| -rw-r--r-- | tools/qdbus/qdbusviewer/qdbusviewer.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.cpp b/tools/qdbus/qdbusviewer/qdbusviewer.cpp index 9c25a89..fcb63a8 100644 --- a/tools/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/tools/qdbus/qdbusviewer/qdbusviewer.cpp @@ -441,21 +441,14 @@ void QDBusViewer::about() { QMessageBox box(this); - // TODO: Remove these variables for 4.6.0. Must keep this way for 4.5.x due to string freeze. - QString edition; - QString info; - QString moreInfo; - box.setText(QString::fromLatin1("<center><img src=\":/trolltech/qdbusviewer/images/qdbusviewer-128.png\">" "<h3>%1</h3>" - "<p>Version %2 %3</p></center>" - "<p>%4</p>" - "<p>%5</p>" + "<p>Version %2</p></center>" "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>" "<p>The program is provided AS IS with NO WARRANTY OF ANY KIND," " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A" " PARTICULAR PURPOSE.<p/>") - .arg(tr("D-Bus Viewer")).arg(QLatin1String(QT_VERSION_STR)).arg(edition).arg(info).arg(moreInfo)); + .arg(tr("D-Bus Viewer")).arg(QLatin1String(QT_VERSION_STR))); box.setWindowTitle(tr("D-Bus Viewer")); box.exec(); } |