diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-28 11:40:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-12 14:26:33 +0000 |
| commit | 3eebadc1734463afa469dcd08eab8c5d2557dec6 (patch) | |
| tree | 939afe7c3da0ff7249c6ae7f167dd56442401f51 /src/printsupport/kernel/qplatformprintdevice.h | |
| parent | 9c8ca26a4829d5ce810c9653fec3dfe48717f0b1 (diff) | |
Modernize the "mimetype" feature
Change-Id: I9b67c2cbc0891a38ece18d521c86fbc7344dce7a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/printsupport/kernel/qplatformprintdevice.h')
| -rw-r--r-- | src/printsupport/kernel/qplatformprintdevice.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/printsupport/kernel/qplatformprintdevice.h b/src/printsupport/kernel/qplatformprintdevice.h index a988518547..76f03dea7e 100644 --- a/src/printsupport/kernel/qplatformprintdevice.h +++ b/src/printsupport/kernel/qplatformprintdevice.h @@ -57,7 +57,9 @@ #include <QtCore/qvariant.h> #include <QtCore/qvector.h> +#if QT_CONFIG(mimetype) #include <QtCore/qmimetype.h> +#endif #include <QtGui/qpagelayout.h> @@ -125,7 +127,7 @@ public: virtual bool setProperty(QPrintDevice::PrintDevicePropertyKey key, const QVariant &value); virtual bool isFeatureAvailable(QPrintDevice::PrintDevicePropertyKey key, const QVariant ¶ms) const; -#ifndef QT_NO_MIMETYPE +#if QT_CONFIG(mimetype) virtual QList<QMimeType> supportedMimeTypes() const; #endif @@ -139,7 +141,7 @@ protected: virtual void loadOutputBins() const; virtual void loadDuplexModes() const; virtual void loadColorModes() const; -#ifndef QT_NO_MIMETYPE +#if QT_CONFIG(mimetype) virtual void loadMimeTypes() const; #endif @@ -178,7 +180,7 @@ protected: mutable bool m_haveColorModes; mutable QVector<QPrint::ColorMode> m_colorModes; -#ifndef QT_NO_MIMETYPE +#if QT_CONFIG(mimetype) mutable bool m_haveMimeTypes; mutable QList<QMimeType> m_mimeTypes; #endif |