diff options
Diffstat (limited to 'src/printsupport/kernel')
-rw-r--r-- | src/printsupport/kernel/qpaintengine_alpha.cpp | 2 | ||||
-rw-r--r-- | src/printsupport/kernel/qplatformprintplugin.cpp | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qplatformprintplugin.h | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/src/printsupport/kernel/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp index 939322cc07..cae5c2f522 100644 --- a/src/printsupport/kernel/qpaintengine_alpha.cpp +++ b/src/printsupport/kernel/qpaintengine_alpha.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include <qglobal.h> +#include <qtprintsupportglobal.h> #ifndef QT_NO_PRINTER #include <qdebug.h> diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp index b50f43056b..9bc4b61829 100644 --- a/src/printsupport/kernel/qplatformprintplugin.cpp +++ b/src/printsupport/kernel/qplatformprintplugin.cpp @@ -43,6 +43,8 @@ #include "private/qfactoryloader_p.h" #include <qcoreapplication.h> +#ifndef QT_NO_PRINTER + QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, @@ -86,3 +88,5 @@ QPlatformPrinterSupport *QPlatformPrinterSupportPlugin::get() } QT_END_NAMESPACE + +#endif diff --git a/src/printsupport/kernel/qplatformprintplugin.h b/src/printsupport/kernel/qplatformprintplugin.h index 3e909519c2..30e8f7938a 100644 --- a/src/printsupport/kernel/qplatformprintplugin.h +++ b/src/printsupport/kernel/qplatformprintplugin.h @@ -53,6 +53,8 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> +#ifndef QT_NO_PRINTER + QT_BEGIN_NAMESPACE @@ -74,4 +76,6 @@ public: QT_END_NAMESPACE +#endif + #endif // QPLATFORMPRINTPLUGIN_H diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 36c873c4f6..706a7c4b02 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -37,6 +37,8 @@ ** ****************************************************************************/ +#include <QtPrintSupport/qtprintsupportglobal.h> + #ifndef QT_NO_PRINTER #include "qprintengine_win_p.h" |