diff options
Diffstat (limited to 'src/printsupport')
27 files changed, 85 insertions, 17 deletions
diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index 8ce3687272..e8eee2ca9c 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -40,8 +40,8 @@ #ifndef QABSTRACTPRINTDIALOG_H #define QABSTRACTPRINTDIALOG_H -#include <QtWidgets/qdialog.h> #include <QtPrintSupport/qtprintsupportglobal.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/printsupport/dialogs/qabstractprintdialog_p.h b/src/printsupport/dialogs/qabstractprintdialog_p.h index 977c720cd0..fe4e18cfc3 100644 --- a/src/printsupport/dialogs/qabstractprintdialog_p.h +++ b/src/printsupport/dialogs/qabstractprintdialog_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #include "private/qdialog_p.h" #ifndef QT_NO_PRINTDIALOG diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index fa8f6b7fad..124d215700 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -40,8 +40,8 @@ #ifndef QPAGESETUPDIALOG_H #define QPAGESETUPDIALOG_H -#include <QtWidgets/qdialog.h> #include <QtPrintSupport/qtprintsupportglobal.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/printsupport/dialogs/qpagesetupdialog_p.h b/src/printsupport/dialogs/qpagesetupdialog_p.h index 4f803ae234..46e178fef9 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_p.h +++ b/src/printsupport/dialogs/qpagesetupdialog_p.h @@ -52,6 +52,7 @@ // // +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #include "private/qdialog_p.h" #ifndef QT_NO_PRINTDIALOG diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix_p.h b/src/printsupport/dialogs/qpagesetupdialog_unix_p.h index c35ad761f4..3c9733dd83 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_unix_p.h +++ b/src/printsupport/dialogs/qpagesetupdialog_unix_p.h @@ -51,7 +51,7 @@ // // -#include "qglobal.h" +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #ifndef QT_NO_PRINTDIALOG diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 36187b28d6..a1d79b2310 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -40,6 +40,7 @@ #ifndef QPRINTDIALOG_H #define QPRINTDIALOG_H +#include <QtPrintSupport/qtprintsupportglobal.h> #include <QtPrintSupport/qabstractprintdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 0d2b3a523c..903083167c 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -40,8 +40,8 @@ #ifndef QPRINTPREVIEWDIALOG_H #define QPRINTPREVIEWDIALOG_H -#include <QtWidgets/qdialog.h> #include <QtPrintSupport/qtprintsupportglobal.h> +#include <QtWidgets/qdialog.h> #ifndef QT_NO_PRINTPREVIEWDIALOG diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index cbbb14342a..bf95d9e8f6 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -11,6 +11,7 @@ HEADERS += \ $$PWD/qplatformprintdevice.h \ $$PWD/qplatformprintplugin.h \ $$PWD/qplatformprintersupport.h \ + $$PWD/qtprintsupportglobal_p.h \ $$PWD/qtprintsupportglobal.h SOURCES += \ diff --git a/src/printsupport/kernel/qcups_p.h b/src/printsupport/kernel/qcups_p.h index 6045ddbaa5..139b18c509 100644 --- a/src/printsupport/kernel/qcups_p.h +++ b/src/printsupport/kernel/qcups_p.h @@ -50,6 +50,8 @@ // // We mean it. // + +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #include "QtCore/qstring.h" #include "QtCore/qstringlist.h" #include "QtPrintSupport/qprinter.h" diff --git a/src/printsupport/kernel/qpaintengine_alpha_p.h b/src/printsupport/kernel/qpaintengine_alpha_p.h index bc3dbfabbf..b5ba98bf88 100644 --- a/src/printsupport/kernel/qpaintengine_alpha_p.h +++ b/src/printsupport/kernel/qpaintengine_alpha_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #ifndef QT_NO_PRINTER #include "private/qpaintengine_p.h" diff --git a/src/printsupport/kernel/qpaintengine_preview_p.h b/src/printsupport/kernel/qpaintengine_preview_p.h index 6eb4daae7c..6277451bfa 100644 --- a/src/printsupport/kernel/qpaintengine_preview_p.h +++ b/src/printsupport/kernel/qpaintengine_preview_p.h @@ -52,6 +52,7 @@ // // +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #include <QtGui/qpaintengine.h> #include <QtPrintSupport/qprintengine.h> diff --git a/src/printsupport/kernel/qplatformprintdevice.h b/src/printsupport/kernel/qplatformprintdevice.h index 6460d2f596..44a3a966f4 100644 --- a/src/printsupport/kernel/qplatformprintdevice.h +++ b/src/printsupport/kernel/qplatformprintdevice.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtPrintSupport/qtprintsupportglobal.h> #include <private/qprint_p.h> #include <QtCore/qvector.h> diff --git a/src/printsupport/kernel/qplatformprintersupport.h b/src/printsupport/kernel/qplatformprintersupport.h index 779b7dd8a1..d3da4295a1 100644 --- a/src/printsupport/kernel/qplatformprintersupport.h +++ b/src/printsupport/kernel/qplatformprintersupport.h @@ -48,6 +48,7 @@ // source and binary incompatible with future versions of Qt. // +#include <QtPrintSupport/qtprintsupportglobal.h> #include <QtPrintSupport/qprinter.h> #include <QtCore/qstringlist.h> diff --git a/src/printsupport/kernel/qplatformprintplugin.h b/src/printsupport/kernel/qplatformprintplugin.h index 69cb55b4d9..3e909519c2 100644 --- a/src/printsupport/kernel/qplatformprintplugin.h +++ b/src/printsupport/kernel/qplatformprintplugin.h @@ -49,9 +49,9 @@ // source and binary incompatible with future versions of Qt. // +#include <QtPrintSupport/qtprintsupportglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -#include <QtPrintSupport/qtprintsupportglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/qprint_p.h b/src/printsupport/kernel/qprint_p.h index ed9e8e272b..47dfce3787 100644 --- a/src/printsupport/kernel/qprint_p.h +++ b/src/printsupport/kernel/qprint_p.h @@ -51,12 +51,13 @@ // We mean it. // +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #include <QtPrintSupport/qprinter.h> #include <QtCore/qstring.h> #include <QtCore/qlist.h> -#if (defined Q_OS_MAC && !defined Q_OS_IOS) || (defined Q_OS_UNIX && !defined QT_NO_CUPS) +#if (defined Q_OS_OSX) || (defined Q_OS_UNIX && !defined QT_NO_CUPS) #include <cups/ppd.h> // Use for type defs only, don't want to actually link in main module #endif @@ -244,7 +245,7 @@ public: return QByteArray(); } -#if (defined Q_OS_MAC && !defined Q_OS_IOS) || (defined Q_OS_UNIX && !defined QT_NO_CUPS) +#if (defined Q_OS_OSX) || (defined Q_OS_UNIX && !defined QT_NO_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, diff --git a/src/printsupport/kernel/qprintdevice_p.h b/src/printsupport/kernel/qprintdevice_p.h index b4173b50b1..1e0d3983e9 100644 --- a/src/printsupport/kernel/qprintdevice_p.h +++ b/src/printsupport/kernel/qprintdevice_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #include "private/qprint_p.h" #include <QtCore/qsharedpointer.h> diff --git a/src/printsupport/kernel/qprintengine.h b/src/printsupport/kernel/qprintengine.h index bb8749c113..698f7548cf 100644 --- a/src/printsupport/kernel/qprintengine.h +++ b/src/printsupport/kernel/qprintengine.h @@ -40,6 +40,7 @@ #ifndef QPRINTENGINE_H #define QPRINTENGINE_H +#include <QtPrintSupport/qtprintsupportglobal.h> #include <QtCore/qvariant.h> #include <QtPrintSupport/qprinter.h> diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 228607d7e3..b3dc33895b 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -1719,7 +1719,6 @@ static void draw_text_item_win(const QPointF &pos, const QTextItemInt &ti, HDC h } } -#if !defined(Q_OS_WINCE) // Scale, rotate and translate here. XFORM win_xform; win_xform.eM11 = xform.m11(); @@ -1731,7 +1730,6 @@ static void draw_text_item_win(const QPointF &pos, const QTextItemInt &ti, HDC h SetGraphicsMode(hdc, GM_ADVANCED); SetWorldTransform(hdc, &win_xform); -#endif if (fast) { // fast path @@ -1784,11 +1782,9 @@ static void draw_text_item_win(const QPointF &pos, const QTextItemInt &ti, HDC h } } -#if !defined(Q_OS_WINCE) win_xform.eM11 = win_xform.eM22 = 1.0; win_xform.eM12 = win_xform.eM21 = win_xform.eDx = win_xform.eDy = 0.0; SetWorldTransform(hdc, &win_xform); -#endif SelectObject(hdc, old_font); } diff --git a/src/printsupport/kernel/qprintengine_win_p.h b/src/printsupport/kernel/qprintengine_win_p.h index 32da184b08..f2c6eeca4c 100644 --- a/src/printsupport/kernel/qprintengine_win_p.h +++ b/src/printsupport/kernel/qprintengine_win_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #ifndef QT_NO_PRINTER diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index d5c63dbf2c..4650d5432a 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -40,11 +40,11 @@ #ifndef QPRINTER_H #define QPRINTER_H +#include <QtPrintSupport/qtprintsupportglobal.h> #include <QtCore/qstring.h> #include <QtCore/qscopedpointer.h> #include <QtGui/qpagedpaintdevice.h> #include <QtGui/qpagelayout.h> -#include <QtPrintSupport/qtprintsupportglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/qprinter_p.h b/src/printsupport/kernel/qprinter_p.h index d3b869077e..18dfad926c 100644 --- a/src/printsupport/kernel/qprinter_p.h +++ b/src/printsupport/kernel/qprinter_p.h @@ -52,7 +52,7 @@ // -#include "QtCore/qglobal.h" +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #ifndef QT_NO_PRINTER diff --git a/src/printsupport/kernel/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h index ed22efc503..8bac395ab3 100644 --- a/src/printsupport/kernel/qprinterinfo.h +++ b/src/printsupport/kernel/qprinterinfo.h @@ -40,6 +40,7 @@ #ifndef QPRINTERINFO_H #define QPRINTERINFO_H +#include <QtPrintSupport/qtprintsupportglobal.h> #include <QtPrintSupport/qprinter.h> #include <QtCore/QList> diff --git a/src/printsupport/kernel/qprinterinfo_p.h b/src/printsupport/kernel/qprinterinfo_p.h index 5d883d54db..727457a959 100644 --- a/src/printsupport/kernel/qprinterinfo_p.h +++ b/src/printsupport/kernel/qprinterinfo_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "QtCore/qglobal.h" +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #ifndef QT_NO_PRINTER diff --git a/src/printsupport/kernel/qtprintsupportglobal.h b/src/printsupport/kernel/qtprintsupportglobal.h index 3772cd23b4..c060b98958 100644 --- a/src/printsupport/kernel/qtprintsupportglobal.h +++ b/src/printsupport/kernel/qtprintsupportglobal.h @@ -40,7 +40,7 @@ #ifndef QTPRINTSUPPORTGLOBAL_H #define QTPRINTSUPPORTGLOBAL_H -#include <QtCore/qglobal.h> +#include <QtWidgets/qtwidgetsglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/qtprintsupportglobal_p.h b/src/printsupport/kernel/qtprintsupportglobal_p.h new file mode 100644 index 0000000000..2f6b924ed0 --- /dev/null +++ b/src/printsupport/kernel/qtprintsupportglobal_p.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtPrintSupport module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTPRINTSUPPORTGLOBAL_P_H +#define QTPRINTSUPPORTGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtPrintSupport/qtprintsupportglobal.h> +#include <QtWidgets/private/qtwidgetsglobal_p.h> + +#endif // QTPRINTSUPPORTGLOBAL_P_H diff --git a/src/printsupport/widgets/qcupsjobwidget_p.h b/src/printsupport/widgets/qcupsjobwidget_p.h index 26fc644f65..e08b8b0574 100644 --- a/src/printsupport/widgets/qcupsjobwidget_p.h +++ b/src/printsupport/widgets/qcupsjobwidget_p.h @@ -53,6 +53,7 @@ // // +#include <QtPrintSupport/private/qtprintsupportglobal_p.h> #include <ui_qcupsjobwidget.h> #include <private/qcups_p.h> diff --git a/src/printsupport/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h index bc4dd59ea5..dec7092eb1 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.h +++ b/src/printsupport/widgets/qprintpreviewwidget.h @@ -40,6 +40,7 @@ #ifndef QPRINTPREVIEWWIDGET_H #define QPRINTPREVIEWWIDGET_H +#include <QtPrintSupport/qtprintsupportglobal.h> #include <QtWidgets/qwidget.h> #include <QtPrintSupport/qprinter.h> |