diff options
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_mac.mm | 2 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_win.cpp | 2 | ||||
| -rw-r--r-- | src/printsupport/kernel/kernel.pri | 4 | ||||
| -rw-r--r-- | src/printsupport/kernel/qplatformprintersupport.h (renamed from src/printsupport/kernel/qplatformprintersupport_qpa.h) | 0 | ||||
| -rw-r--r-- | src/printsupport/kernel/qplatformprintersupport_qpa.cpp | 2 | ||||
| -rw-r--r-- | src/printsupport/kernel/qplatformprintplugin.cpp | 2 | ||||
| -rw-r--r-- | src/printsupport/kernel/qplatformprintplugin.h (renamed from src/printsupport/kernel/qplatformprintplugin_qpa.h) | 0 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 2 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 4 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprinterinfo.cpp | 4 |
10 files changed, 11 insertions, 11 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm index 1dded4f905..3e84423fd8 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm +++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm @@ -46,7 +46,7 @@ #include "qpagesetupdialog.h" #include "qabstractpagesetupdialog_p.h" -#include <QtGui/qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> #include <QtPrintSupport/qprintengine.h> QT_USE_NAMESPACE diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index 9d7387edba..cb69d0400f 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -47,7 +47,7 @@ #include "../kernel/qprintengine_win_p.h" #include "qabstractpagesetupdialog_p.h" #include "qprinter.h" -#include <QtGui/qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index d7c9f56545..10d9f877a0 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -6,8 +6,8 @@ HEADERS += \ $$PWD/qprinter_p.h \ $$PWD/qprinterinfo.h \ $$PWD/qprinterinfo_p.h \ - $$PWD/qplatformprintplugin_qpa.h \ - $$PWD/qplatformprintersupport_qpa.h + $$PWD/qplatformprintplugin.h \ + $$PWD/qplatformprintersupport.h SOURCES += \ $$PWD/qpaintengine_alpha.cpp \ diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.h b/src/printsupport/kernel/qplatformprintersupport.h index 5dba56579c..5dba56579c 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.h +++ b/src/printsupport/kernel/qplatformprintersupport.h diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp index 1ed28b8090..9c0c3f131c 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp +++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformprintersupport_qpa.h" +#include "qplatformprintersupport.h" #include <QtPrintSupport/qprinterinfo.h> diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp index 2c87fcc5e6..ec068d87d1 100644 --- a/src/printsupport/kernel/qplatformprintplugin.cpp +++ b/src/printsupport/kernel/qplatformprintplugin.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformprintplugin_qpa.h" +#include "qplatformprintplugin.h" #include "private/qfactoryloader_p.h" QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/qplatformprintplugin_qpa.h b/src/printsupport/kernel/qplatformprintplugin.h index aec3e02fa6..aec3e02fa6 100644 --- a/src/printsupport/kernel/qplatformprintplugin_qpa.h +++ b/src/printsupport/kernel/qplatformprintplugin.h diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 37d2b27d15..3c079e24f3 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -54,7 +54,7 @@ #include <qdebug.h> #include <qvector.h> #include <qpicture.h> -#include <qplatformpixmap_qpa.h> +#include <qpa/qplatformpixmap.h> #include <private/qpicture_p.h> #include <private/qpixmap_raster_p.h> diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 6682550849..4929b3308e 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -52,8 +52,8 @@ #ifndef QT_NO_PRINTER -#include "qplatformprintplugin_qpa.h" -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformprintplugin.h> +#include <qpa/qplatformprintersupport.h> #include <private/qpagedpaintdevice_p.h> #if defined(Q_WS_X11) diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp index 8d498a7e59..3d0ba7f31d 100644 --- a/src/printsupport/kernel/qprinterinfo.cpp +++ b/src/printsupport/kernel/qprinterinfo.cpp @@ -30,8 +30,8 @@ #ifndef QT_NO_PRINTER -#include "qplatformprintplugin_qpa.h" -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformprintplugin.h> +#include <qpa/qplatformprintersupport.h> QT_BEGIN_NAMESPACE |