diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 06:38:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 06:38:49 (GMT) |
| commit | ee5c961ab564d9eb7e1902aae384f6d3ac9242e4 (patch) | |
| tree | fe92e01ff2486998c6f1f189b0000be195b84973 /tests | |
| parent | 5b445e21bae38b6b82e2e19603df983303a45547 (diff) | |
| parent | 52ffd9f99febcc1b8192f653d9ad39dc8f6e9172 (diff) | |
| download | Qt-ee5c961ab564d9eb7e1902aae384f6d3ac9242e4.zip Qt-ee5c961ab564d9eb7e1902aae384f6d3ac9242e4.tar.gz Qt-ee5c961ab564d9eb7e1902aae384f6d3ac9242e4.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Moved the default dependency targets to default_post.prf.
Fixed autotest.
get rid of QPrinterInfoPrivate::isNull member
QPrinterInfo::supportedPaperSizes(): return early if the info is invalid
fix QPrinterInfo::defaultPrinter() on win
micro-optimizations, clean-ups and styling fixes
refactoring of QPrinterInfo
minor refactoring of QPrinterInfoPrivate
use binary search int the string2PaperSize() helper
Diffstat (limited to 'tests')
| -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 c3fad6c..4f767a5 100644 --- a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp +++ b/tests/auto/qprinterinfo/tst_qprinterinfo.cpp @@ -134,7 +134,7 @@ QStringList tst_QPrinterInfo::getPrintersFromSystem() QString output = getOutputFromCommand(command); QStringList list = output.split(QChar::fromLatin1('\n')); - QRegExp reg("^[Pp]rinter ([.a-zA-Z0-9_-]+)"); + QRegExp reg("^[Pp]rinter ([.a-zA-Z0-9-_@]+)"); for (int c = 0; c < list.size(); ++c) { if (reg.indexIn(list[c]) >= 0) { QString printer = reg.cap(1); |