summaryrefslogtreecommitdiffstats
path: root/src/core/printing
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-02 13:06:30 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 20:04:31 +0000
commitd7a1ea4a6b38d2818d44da378f25cd42e1472286 (patch)
treec1003438263af1e88610b6c90326e1c8d96c42cd /src/core/printing
parent8161f340cc1517c90f8232284aa42f84d7f2aae9 (diff)
Cleanup pdfium_document_wrapper_qt.h include
Do not make it depend on a define that could break precompiled headers, instead only included it when it is valid. Task-number: QTBUG-67977 Change-Id: I65f4de89de06d7a35c8dd97e4e9bd92d8c6dca54 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/printing')
-rw-r--r--src/core/printing/pdfium_document_wrapper_qt.cpp7
-rw-r--r--src/core/printing/pdfium_document_wrapper_qt.h4
2 files changed, 2 insertions, 9 deletions
diff --git a/src/core/printing/pdfium_document_wrapper_qt.cpp b/src/core/printing/pdfium_document_wrapper_qt.cpp
index ca1e8cd07..a7433b2cc 100644
--- a/src/core/printing/pdfium_document_wrapper_qt.cpp
+++ b/src/core/printing/pdfium_document_wrapper_qt.cpp
@@ -37,11 +37,8 @@
**
****************************************************************************/
#include "pdf/features.h"
-#if BUILDFLAG(ENABLE_PDF)
-#define ENABLE_PDF
-#endif
-#if defined(ENABLE_PDF)
+#if BUILDFLAG(ENABLE_PDF)
#include "pdfium_document_wrapper_qt.h"
#include <QtCore/qhash.h>
@@ -168,4 +165,4 @@ PdfiumDocumentWrapperQt::~PdfiumDocumentWrapperQt()
}
}
-#endif // defined (ENABLE_PDF)
+#endif // BUILDFLAG(ENABLE_PDF)
diff --git a/src/core/printing/pdfium_document_wrapper_qt.h b/src/core/printing/pdfium_document_wrapper_qt.h
index 28c490ae5..7886c51c0 100644
--- a/src/core/printing/pdfium_document_wrapper_qt.h
+++ b/src/core/printing/pdfium_document_wrapper_qt.h
@@ -40,11 +40,8 @@
#ifndef PDFIUM_DOCUMENT_WRAPPER_QT_H
#define PDFIUM_DOCUMENT_WRAPPER_QT_H
-#if defined(ENABLE_PDF)
#include "qtwebenginecoreglobal.h"
-#include <QtCore/qglobal.h>
-#include <QtCore/qhash.h>
#include <QtGui/qimage.h>
namespace QtWebEngineCore {
@@ -67,5 +64,4 @@ private:
};
} // namespace QtWebEngineCore
-#endif // defined (ENABLE_PDF)
#endif // PDFIUM_DOCUMENT_WRAPPER_QT_H