diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-03 12:19:05 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-03 12:19:05 (GMT) |
| commit | 6147b21f92b9101f69ed2d916ed005aeb378bdc1 (patch) | |
| tree | e684f880a7af0267bb756b7d5a2b7eed66eebfb9 /tools/designer | |
| parent | 77bc072f5b93e43f38eeb31d966fa76a3f6bd61c (diff) | |
| parent | 5699577461e75093222d6bcd7ce22b0c24a74095 (diff) | |
| download | Qt-6147b21f92b9101f69ed2d916ed005aeb378bdc1.zip Qt-6147b21f92b9101f69ed2d916ed005aeb378bdc1.tar.gz Qt-6147b21f92b9101f69ed2d916ed005aeb378bdc1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/designer')
| -rw-r--r-- | tools/designer/src/designer/versiondialog.cpp | 4 | ||||
| -rw-r--r-- | tools/designer/src/lib/shared/qlayout_widget.cpp | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp index 4b8e493..d503738 100644 --- a/tools/designer/src/designer/versiondialog.cpp +++ b/tools/designer/src/designer/versiondialog.cpp @@ -174,9 +174,7 @@ VersionDialog::VersionDialog(QWidget *parent) lbl->setText(tr("%1" "<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)." - "<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND," - " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A" - " PARTICULAR PURPOSE.<br/> ").arg(version)); + ).arg(version).arg(edition)); lbl->setWordWrap(true); lbl->setOpenExternalLinks(true); diff --git a/tools/designer/src/lib/shared/qlayout_widget.cpp b/tools/designer/src/lib/shared/qlayout_widget.cpp index a710e29..77876ca 100644 --- a/tools/designer/src/lib/shared/qlayout_widget.cpp +++ b/tools/designer/src/lib/shared/qlayout_widget.cpp @@ -37,9 +37,6 @@ ** ** $QT_END_LICENSE$ ** -** This file is provided AS IS with NO WARRANTY OF ANY KND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** ****************************************************************************/ #include "qlayout_widget_p.h" |