diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 16:29:13 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 16:29:13 +1000 |
| commit | 0c831b8cf84c72ee8673d1d38f4e93e350dddd5f (patch) | |
| tree | 84fc3c89d73342ec70d77b2bdf99066f987536b8 /tests/auto/qprinterinfo/tst_qprinterinfo.cpp | |
| parent | b98b7d305ffebb700e471bd64a7dee59d947e056 (diff) | |
| parent | 4b1b93f3f97de70af316052bc38048f52631b9e4 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tests/auto/qprinterinfo/tst_qprinterinfo.cpp')
| -rw-r--r-- | tests/auto/qprinterinfo/tst_qprinterinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp index f4be0feba..076a82fe0 100644 --- a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -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"; |