diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
| commit | ccf26f6a88e116abdf8e53acdc02dbd98a4a8dc4 (patch) | |
| tree | 40aaca99471edc709d38e6f82153576bad86747f /src/printsupport/kernel/qprintdevice_p.h | |
| parent | 8ff1ae89bfa32c586e3b44b71dfc49d294a3e043 (diff) | |
| parent | 3eebadc1734463afa469dcd08eab8c5d2557dec6 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/plugins/platformthemes/platformthemes.pro
src/printsupport/kernel/qplatformprintdevice.cpp
Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6
Diffstat (limited to 'src/printsupport/kernel/qprintdevice_p.h')
| -rw-r--r-- | src/printsupport/kernel/qprintdevice_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/printsupport/kernel/qprintdevice_p.h b/src/printsupport/kernel/qprintdevice_p.h index 562ccd2057..a2b18f08cf 100644 --- a/src/printsupport/kernel/qprintdevice_p.h +++ b/src/printsupport/kernel/qprintdevice_p.h @@ -139,7 +139,7 @@ public: bool setProperty(PrintDevicePropertyKey key, const QVariant &value); bool isFeatureAvailable(PrintDevicePropertyKey key, const QVariant ¶ms) const; -#ifndef QT_NO_MIMETYPE +#if QT_CONFIG(mimetype) QList<QMimeType> supportedMimeTypes() const; #endif |