summaryrefslogtreecommitdiffstats
path: root/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qprinterinfo/tst_qprinterinfo.cpp')
-rw-r--r--tests/auto/qprinterinfo/tst_qprinterinfo.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
index 635a4b7..fc28ec3 100644
--- a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
+++ b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the test suite of the Qt Toolkit.
@@ -21,9 +20,10 @@
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
@@ -301,7 +301,7 @@ void tst_QPrinterInfo::testForPrinters()
void tst_QPrinterInfo::testForPaperSizes()
{
QSKIP("PaperSize feature doesn't work on Windows, fails on Mac, and is unstable on Linux", SkipAll);
- // This test is based on common printers found at the Trolltech Oslo
+ // This test is based on common printers found at the Oslo
// office. It is likely to be skipped or fail for other locations.
QStringList hardPrinters;
hardPrinters << "Finnmarka" << "Huldra";