diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 08:25:13 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 08:25:13 (GMT) |
| commit | 6c3f538a0657bd7b00f32934234395682623c17a (patch) | |
| tree | 1185d0a014f09dec9c44dc336a6514d716c15eab /tools/designer | |
| parent | 0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1 (diff) | |
| parent | 92a3662564f421a46761989d153f6c8eb990131f (diff) | |
| download | Qt-6c3f538a0657bd7b00f32934234395682623c17a.zip Qt-6c3f538a0657bd7b00f32934234395682623c17a.tar.gz Qt-6c3f538a0657bd7b00f32934234395682623c17a.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'tools/designer')
| -rw-r--r-- | tools/designer/src/designer/versiondialog.cpp | 2 | ||||
| -rw-r--r-- | tools/designer/src/uitools/uitools.pro | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp index d503738..10430d8 100644 --- a/tools/designer/src/designer/versiondialog.cpp +++ b/tools/designer/src/designer/versiondialog.cpp @@ -174,7 +174,7 @@ VersionDialog::VersionDialog(QWidget *parent) lbl->setText(tr("%1" "<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)." - ).arg(version).arg(edition)); + ).arg(version)); lbl->setWordWrap(true); lbl->setOpenExternalLinks(true); diff --git a/tools/designer/src/uitools/uitools.pro b/tools/designer/src/uitools/uitools.pro index 34e4877..38b7add 100644 --- a/tools/designer/src/uitools/uitools.pro +++ b/tools/designer/src/uitools/uitools.pro @@ -39,3 +39,4 @@ unix { QMAKE_PKGCONFIG_REQUIRES += QtXml } +symbian: TARGET.UID3 = 0x2001E628 |