diff options
| author | Albert Astals Cid <aacid@kde.org> | 2013-05-07 22:00:02 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2013-05-07 22:00:02 +0200 |
| commit | 5e73cb059e27f68b329513de609d52e84d73f8af (patch) | |
| tree | c7d2d7f16b800e18f1e22e37ce602d1a5a23d2a3 /qt4 | |
| parent | 5e9654a3eb28b2c8b0985545778dd0e45829f8e1 (diff) | |
| parent | b3e44fc59a9258ad701bc67132dea0646fd8b61a (diff) | |
Merge remote-tracking branch 'origin/poppler-0.22'
Diffstat (limited to 'qt4')
| -rw-r--r-- | qt4/src/poppler-embeddedfile.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qt4/src/poppler-embeddedfile.cc b/qt4/src/poppler-embeddedfile.cc index 5b3f7d3d..f70573ac 100644 --- a/qt4/src/poppler-embeddedfile.cc +++ b/qt4/src/poppler-embeddedfile.cc @@ -1,5 +1,5 @@ /* poppler-document.cc: qt interface to poppler - * Copyright (C) 2005, 2008, 2009, 2012, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2005, 2008, 2009, 2012, 2013, Albert Astals Cid <aacid@kde.org> * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net> * Copyright (C) 2008, 2011, Pino Toscano <pino@kde.org> * @@ -69,7 +69,7 @@ EmbeddedFile::~EmbeddedFile() QString EmbeddedFile::name() const { GooString *goo = m_embeddedFile->filespec->getFileName(); - return goo ? QString(goo->getCString()) : QString(); + return goo ? UnicodeParsedString(goo) : QString(); } QString EmbeddedFile::description() const |