diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2011-03-16 01:40:42 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2011-03-16 01:40:42 (GMT) |
| commit | 82ae515e52e3811d3b2aec588e0dd777350c1c33 (patch) | |
| tree | 0f67931ff94feafa8b76cfd22064220ee4986fe0 /tests/arthur/common | |
| parent | 9a5f3dd71a7c3bb4e777c92cca09100d077a736a (diff) | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
| download | Qt-82ae515e52e3811d3b2aec588e0dd777350c1c33.zip Qt-82ae515e52e3811d3b2aec588e0dd777350c1c33.tar.gz Qt-82ae515e52e3811d3b2aec588e0dd777350c1c33.tar.bz2 | |
Merge branch 'master' of ../qt-qml-staging
Diffstat (limited to 'tests/arthur/common')
| -rw-r--r-- | tests/arthur/common/baselineprotocol.cpp | 4 | ||||
| -rw-r--r-- | tests/arthur/common/baselineprotocol.h | 2 | ||||
| -rw-r--r-- | tests/arthur/common/lookup3.cpp | 2 | ||||
| -rw-r--r-- | tests/arthur/common/qbaselinetest.cpp | 2 | ||||
| -rw-r--r-- | tests/arthur/common/qbaselinetest.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tests/arthur/common/baselineprotocol.cpp b/tests/arthur/common/baselineprotocol.cpp index e4445bd..0e7e507 100644 --- a/tests/arthur/common/baselineprotocol.cpp +++ b/tests/arthur/common/baselineprotocol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -310,7 +310,7 @@ bool BaselineProtocol::connect(const QString &testCase, bool *dryrun) } if (cmd == Abort) { - errMsg += QLS("Server aborted connection. Reason: ") + QString::fromLatin1(block); + errMsg += QLS("Server rejected connection. Reason: ") + QString::fromLatin1(block); return false; } diff --git a/tests/arthur/common/baselineprotocol.h b/tests/arthur/common/baselineprotocol.h index 2315bc3..259555d 100644 --- a/tests/arthur/common/baselineprotocol.h +++ b/tests/arthur/common/baselineprotocol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/arthur/common/lookup3.cpp b/tests/arthur/common/lookup3.cpp index 8cdc64b..1aa501f 100644 --- a/tests/arthur/common/lookup3.cpp +++ b/tests/arthur/common/lookup3.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/arthur/common/qbaselinetest.cpp b/tests/arthur/common/qbaselinetest.cpp index 79241d5..1d028f8 100644 --- a/tests/arthur/common/qbaselinetest.cpp +++ b/tests/arthur/common/qbaselinetest.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/arthur/common/qbaselinetest.h b/tests/arthur/common/qbaselinetest.h index e27cda2..dc32109 100644 --- a/tests/arthur/common/qbaselinetest.h +++ b/tests/arthur/common/qbaselinetest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |