Make things compile with the printer feature disabled
Always include qtprintsupportglobal.h before checking the ifdef, and add ifdef's where they where missing. Change-Id: I535dce33b26955fb0196ea05d54be41fe93e9151 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
parent
b754b2815d
commit
b22471edf9
@ -38,6 +38,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include "qplatformdefs.h"
|
||||
#include <QtPrintSupport/qtprintsupportglobal.h>
|
||||
|
||||
#ifndef QT_NO_PRINTDIALOG
|
||||
|
||||
|
@ -37,6 +37,8 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtPrintSupport/qtprintsupportglobal.h>
|
||||
|
||||
#ifndef QT_NO_PRINTDIALOG
|
||||
|
||||
#include "qprintdialog.h"
|
||||
|
@ -37,7 +37,7 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <qglobal.h>
|
||||
#include <qtprintsupportglobal.h>
|
||||
|
||||
#ifndef QT_NO_PRINTER
|
||||
#include <qdebug.h>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -37,6 +37,8 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtPrintSupport/qtprintsupportglobal.h>
|
||||
|
||||
#ifndef QT_NO_PRINTER
|
||||
|
||||
#include "qprintengine_win_p.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user