From fbeeaf23fe1755bc28185781d8182ddcb4e7985a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Martins?= <sergio.martins@kdab.com>
Date: Sun, 15 Feb 2015 16:39:13 +0000
Subject: Introduce QT_NO_MIMETYPE

The mime type stuff generates one of the biggest translation units in QtCore
due to the compressed 1.7MB freedesktop.org.xml resource.

With QT_NO_MIMETYPE, libQt5Core.so is almost 400Kb smaller
(4.8MB->4.4MB gcc 4.9 stripped release build)

Change-Id: I5339090994034355724ff4deddb64720e81baeaf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
---
 src/printsupport/kernel/qplatformprintdevice.cpp | 2 ++
 src/printsupport/kernel/qplatformprintdevice.h   | 6 ++++++
 src/printsupport/kernel/qprintdevice.cpp         | 2 ++
 src/printsupport/kernel/qprintdevice_p.h         | 2 ++
 4 files changed, 12 insertions(+)

(limited to 'src/printsupport')

diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp
index b18d4a1cc6..bd6d81774c 100644
--- a/src/printsupport/kernel/qplatformprintdevice.cpp
+++ b/src/printsupport/kernel/qplatformprintdevice.cpp
@@ -359,6 +359,7 @@ QList<QPrint::ColorMode> QPlatformPrintDevice::supportedColorModes() const
     return m_colorModes.toList();
 }
 
+#ifndef QT_NO_MIMETYPE
 void QPlatformPrintDevice::loadMimeTypes() const
 {
 }
@@ -369,6 +370,7 @@ QList<QMimeType> QPlatformPrintDevice::supportedMimeTypes() const
         loadMimeTypes();
     return m_mimeTypes.toList();
 }
+#endif // QT_NO_MIMETYPE
 
 QPageSize QPlatformPrintDevice::createPageSize(const QString &key, const QSize &size, const QString &localizedName)
 {
diff --git a/src/printsupport/kernel/qplatformprintdevice.h b/src/printsupport/kernel/qplatformprintdevice.h
index 684c37c35d..cb8c47f99e 100644
--- a/src/printsupport/kernel/qplatformprintdevice.h
+++ b/src/printsupport/kernel/qplatformprintdevice.h
@@ -114,7 +114,9 @@ public:
     virtual QPrint::ColorMode defaultColorMode() const;
     virtual QList<QPrint::ColorMode> supportedColorModes() const;
 
+#ifndef QT_NO_MIMETYPE
     virtual QList<QMimeType> supportedMimeTypes() const;
+#endif
 
     static QPageSize createPageSize(const QString &key, const QSize &size, const QString &localizedName);
     static QPageSize createPageSize(int windowsId, const QSize &size, const QString &localizedName);
@@ -126,7 +128,9 @@ protected:
     virtual void loadOutputBins() const;
     virtual void loadDuplexModes() const;
     virtual void loadColorModes() const;
+#ifndef QT_NO_MIMETYPE
     virtual void loadMimeTypes() const;
+#endif
 
     QPageSize supportedPageSizeMatch(const QPageSize &pageSize) const;
 
@@ -163,8 +167,10 @@ protected:
     mutable bool m_haveColorModes;
     mutable QVector<QPrint::ColorMode> m_colorModes;
 
+#ifndef QT_NO_MIMETYPE
     mutable bool m_haveMimeTypes;
     mutable QVector<QMimeType> m_mimeTypes;
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/printsupport/kernel/qprintdevice.cpp b/src/printsupport/kernel/qprintdevice.cpp
index 373cc08bcb..e645442be2 100644
--- a/src/printsupport/kernel/qprintdevice.cpp
+++ b/src/printsupport/kernel/qprintdevice.cpp
@@ -237,10 +237,12 @@ QList<QPrint::ColorMode> QPrintDevice::supportedColorModes() const
     return isValid() ? d->supportedColorModes() : QList<QPrint::ColorMode>();
 }
 
+#ifndef QT_NO_MIMETYPE
 QList<QMimeType> QPrintDevice::supportedMimeTypes() const
 {
     return isValid() ? d->supportedMimeTypes() : QList<QMimeType>();
 }
+#endif // QT_NO_MIMETYPE
 
 #endif // QT_NO_PRINTER
 
diff --git a/src/printsupport/kernel/qprintdevice_p.h b/src/printsupport/kernel/qprintdevice_p.h
index e2a3e7872b..0250b937bd 100644
--- a/src/printsupport/kernel/qprintdevice_p.h
+++ b/src/printsupport/kernel/qprintdevice_p.h
@@ -123,7 +123,9 @@ public:
     QPrint::ColorMode defaultColorMode() const;
     QList<QPrint::ColorMode> supportedColorModes() const;
 
+#ifndef QT_NO_MIMETYPE
     QList<QMimeType> supportedMimeTypes() const;
+#endif
 
 private:
     friend class QPlatformPrinterSupport;
-- 
cgit v1.2.3