diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /src/printsupport/kernel/qprint_p.h | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/printsupport/kernel/qprint_p.h')
| -rw-r--r-- | src/printsupport/kernel/qprint_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/printsupport/kernel/qprint_p.h b/src/printsupport/kernel/qprint_p.h index 47dfce3787..280c2d7608 100644 --- a/src/printsupport/kernel/qprint_p.h +++ b/src/printsupport/kernel/qprint_p.h @@ -57,7 +57,7 @@ #include <QtCore/qstring.h> #include <QtCore/qlist.h> -#if (defined Q_OS_OSX) || (defined Q_OS_UNIX && !defined QT_NO_CUPS) +#if (defined Q_OS_MACOS) || (defined Q_OS_UNIX && QT_CONFIG(cups)) #include <cups/ppd.h> // Use for type defs only, don't want to actually link in main module #endif @@ -245,7 +245,7 @@ public: return QByteArray(); } -#if (defined Q_OS_OSX) || (defined Q_OS_UNIX && !defined QT_NO_CUPS) +#if (defined Q_OS_MACOS) || (defined Q_OS_UNIX && QT_CONFIG(cups)) // PPD utilities shared by CUPS and Mac plugins requiring CUPS headers // May turn into a proper internal QPpd class if enough shared between Mac and CUPS, |