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:
  Fixed PREPEND_INCLUDEPATH being executed too early.
  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

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);