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/qprintdevice.cpp | |
| 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/qprintdevice.cpp')
| -rw-r--r-- | src/printsupport/kernel/qprintdevice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/printsupport/kernel/qprintdevice.cpp b/src/printsupport/kernel/qprintdevice.cpp index 50fc14169d..7fca3e45bf 100644 --- a/src/printsupport/kernel/qprintdevice.cpp +++ b/src/printsupport/kernel/qprintdevice.cpp @@ -260,12 +260,12 @@ bool QPrintDevice::isFeatureAvailable(PrintDevicePropertyKey key, const QVariant return isValid() ? d->isFeatureAvailable(key, params) : false; } -#ifndef QT_NO_MIMETYPE +#if QT_CONFIG(mimetype) QList<QMimeType> QPrintDevice::supportedMimeTypes() const { return isValid() ? d->supportedMimeTypes() : QList<QMimeType>(); } -#endif // QT_NO_MIMETYPE +#endif // mimetype # ifndef QT_NO_DEBUG_STREAM void QPrintDevice::format(QDebug debug) const @@ -296,7 +296,7 @@ void QPrintDevice::format(QDebug debug) const debug << "), defaultResolution=" << defaultResolution() << ", defaultDuplexMode=" << defaultDuplexMode() << ", defaultColorMode="<< defaultColorMode(); -# ifndef QT_NO_MIMETYPE +# if QT_CONFIG(mimetype) const QList<QMimeType> mimeTypes = supportedMimeTypes(); if (!mimeTypes.isEmpty()) { debug << ", supportedMimeTypes=("; @@ -304,7 +304,7 @@ void QPrintDevice::format(QDebug debug) const debug << " \"" << mimeType.name() << '"'; debug << ')'; } -# endif // !QT_NO_MIMETYPE +# endif // mimetype } else { debug << "null"; } |