diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-02 04:15:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-02 04:15:02 (GMT) |
commit | fe1b0b9e161977b3068f752fbb9f9293df590883 (patch) | |
tree | 2593640ccf6d4ab50fd7555dfb166848012fd365 /tests/auto/qprinterinfo/tst_qprinterinfo.cpp | |
parent | 737b5dc88e3214e35348335120caf20732c0b5b2 (diff) | |
parent | ae1aa7c2b155dc63eec677427eecd0db33328fdc (diff) | |
download | Qt-fe1b0b9e161977b3068f752fbb9f9293df590883.zip Qt-fe1b0b9e161977b3068f752fbb9f9293df590883.tar.gz Qt-fe1b0b9e161977b3068f752fbb9f9293df590883.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
changelog
Compile with DEBUG_FONTENGINE define
minor optimization
remove the old compatibility code
make QFontEngineQPF1 work even without mmap(2) support
Doc: Fixing typo
Diffstat (limited to 'tests/auto/qprinterinfo/tst_qprinterinfo.cpp')
-rw-r--r-- | tests/auto/qprinterinfo/tst_qprinterinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp index 582fd46..7e5da4a 100644 --- a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp @@ -292,7 +292,7 @@ void tst_QPrinterInfo::testForPrinters() for (int i = 0; i < sysPrinters.size(); ++i) { if (!qtPrinters.value(sysPrinters.at(i))) { - qDebug() << "Avaliable printers: " << qtPrinters; + qDebug() << "Available printers: " << qtPrinters; QFAIL(qPrintable(QString("Printer '%1' reported by system, but not reported by Qt").arg(sysPrinters.at(i)))); } } |