diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-07-25 12:13:00 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-07-25 14:19:49 +0000 |
| commit | cab3f0279696c5213a33f7875a40dc6d68709d82 (patch) | |
| tree | 09ebd1f8cfa37999897d118fed70274c508b2ddf | |
| parent | e4322ad035dd380a5f5330799a0e8eb1c093ba24 (diff) | |
Prospective build fix for gcc 4.9.1
Avoid #error "inttypes.h has already been included before this header file, but without __STDC_FORMAT_MACROS defined."
by removing PCH. The removal of PCH means we have to define NOMINMAX ourselves, as that came implicitly before
that.
Change-Id: Ifc4911ddcf6bfab17c3b9853bff5b0c1d96faeb3
Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com>
| -rw-r--r-- | src/pdf/jsbridge.cpp | 5 | ||||
| -rw-r--r-- | src/pdf/pdf.pro | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/pdf/jsbridge.cpp b/src/pdf/jsbridge.cpp index ec9d173..3761973 100644 --- a/src/pdf/jsbridge.cpp +++ b/src/pdf/jsbridge.cpp @@ -19,10 +19,5 @@ ** ******************************************************************************/ -#include <qglobal.h> - -#include "fsdk_mgr.h" -#include "fpdfsdk/javascript/ijs_context.h" -#include "fpdfsdk/javascript/ijs_runtime.h" #include "fpdfsdk/javascript/JS_Runtime_Stub.cpp" diff --git a/src/pdf/pdf.pro b/src/pdf/pdf.pro index 67504ec..13753c2 100644 --- a/src/pdf/pdf.pro +++ b/src/pdf/pdf.pro @@ -3,6 +3,8 @@ QT += gui core QT_PRIVATE += network TEMPLATE = lib CONFIG += c++11 +CONFIG -= precompile_header # Not supported by upstream header files +win32: DEFINES += NOMINMAX INCLUDEPATH += ../3rdparty/pdfium/fpdfsdk/include INCLUDEPATH += ../3rdparty/pdfium INCLUDEPATH += ../3rdparty/pdfium/third_party/freetype/include |