Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12

This commit is contained in:
Albert Astals Cid 2013-12-15 23:47:27 +01:00
commit 88e4bbbbf5

View file

@ -430,7 +430,8 @@ QStringList FilePrinter::jobname( QPrinter &printer, const QString &version )
}
if ( version.startsWith( "lpr" ) ) {
return QStringList("-J") << printer.docName();
const QString shortenedDocName = QString::fromUtf8(printer.docName().toUtf8().left(255));
return QStringList("-J") << shortenedDocName;
}
}