[poppler] Branch 'poppler-0.16' - qt4/src

[Albert Astals Cid]

 qt4/src/poppler-page.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a858e155822d78f4f0ed64fab388468616a47788
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat May 28 12:37:08 2011 +0100

    Parse that as unicode
    
    Fixes KDE Bug #274055

diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
index b0821cb..8fa6aaa 100644
--- a/qt4/src/poppler-page.cc
+++ b/qt4/src/poppler-page.cc
@@ -1,7 +1,7 @@
 /* poppler-page.cc: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
  * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
- * Copyright (C) 2005-2010, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005-2011, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus at math.uni-koeln.de>
  * Copyright (C) 2006-2010, Pino Toscano <pino at kde.org>
  * Copyright (C) 2008 Carlos Garcia Campos <carlosgc at gnome.org>
@@ -1357,7 +1357,7 @@ QString Page::label() const
   if (!m_page->parentDoc->doc->getCatalog()->indexToLabel(m_page->index, &goo))
     return QString();
 
-  return QString(goo.getCString());
+  return UnicodeParsedString(&goo);
 }