From 830cbb1aaf047d8f0ab63f25148b7dc7cc9f8fe0 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <stasuku@gmail.com>
Date: Sat, 13 Apr 2013 15:54:12 +0900
Subject: Make qtbase compile with QT_NO_TEMPORARYFILE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ida2f59bb245ef70bf65f7e8944c4c315d5bc2f81
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/gui/text/qfontsubset.cpp | 3 +++
 src/gui/text/qfontsubset_p.h | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/gui/text')

diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp
index 649c6ec36d..3c39272d11 100644
--- a/src/gui/text/qfontsubset.cpp
+++ b/src/gui/text/qfontsubset.cpp
@@ -91,6 +91,8 @@ static const unsigned short symbol_map[0x100] = {
 
 // ---------------------------- PS/PDF helper methods -----------------------------------
 
+#ifndef QT_NO_PDF
+
 QByteArray QFontSubset::glyphName(unsigned short unicode, bool symbol)
 {
     if (symbol && unicode < 0x100)
@@ -311,6 +313,7 @@ int QFontSubset::addGlyph(int index)
     return idx;
 }
 
+#endif // QT_NO_PDF
 
 // ------------------------------ Truetype generation ----------------------------------------------
 
diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h
index 00054dfe39..df5e72ab7d 100644
--- a/src/gui/text/qfontsubset_p.h
+++ b/src/gui/text/qfontsubset_p.h
@@ -62,13 +62,19 @@ class QFontSubset
 public:
     explicit QFontSubset(QFontEngine *fe, int obj_id = 0)
         : object_id(obj_id), noEmbed(false), fontEngine(fe), downloaded_glyphs(0), standard_font(false)
-        { fontEngine->ref.ref(); addGlyph(0); }
+    {
+        fontEngine->ref.ref();
+#ifndef QT_NO_PDF
+        addGlyph(0);
+#endif
+    }
     ~QFontSubset() {
         if (!fontEngine->ref.deref())
             delete fontEngine;
     }
 
     QByteArray toTruetype() const;
+#ifndef QT_NO_PDF
     QByteArray widthArray() const;
     QByteArray createToUnicodeMap() const;
     QVector<int> getReverseMap() const;
@@ -77,6 +83,7 @@ public:
     static QByteArray glyphName(unsigned short unicode, bool symbol);
 
     int addGlyph(int index);
+#endif
     const int object_id;
     bool noEmbed;
     QFontEngine *fontEngine;
-- 
cgit v1.2.3