summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2014-12-15 10:27:27 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2014-12-15 10:27:27 +0100
commite50236fb9f7f845f0e33b12eb535055f948bcfce (patch)
tree1be0d8aae09b2d57855c0056beb93a9a421ef5e3
parent59fdad877b902a4642acb7f913f0351c8402ab2d (diff)
Build the pdfium sources as a separate static library
That way we can build the Qt code with full warnings enabled (modulo -Wno-unused-parameter because of the pdfium headers)
-rw-r--r--.qmake.conf2
-rw-r--r--src/lib/lib.pro8
-rw-r--r--src/qpdf/qpdf.pro10
-rw-r--r--src/src.pro2
4 files changed, 18 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf
index a98bcf6..0f3f4d1 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,5 @@
load(qt_build_config)
+CONFIG += warning_clean
+
MODULE_VERSION = 5.5.0
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
new file mode 100644
index 0000000..ce9bfdb
--- /dev/null
+++ b/src/lib/lib.pro
@@ -0,0 +1,8 @@
+TARGET = qtpdfium
+
+CONFIG += static hide_symbols warn_off rtti_off exceptions_off c++11
+
+load(qt_helper_lib)
+
+VPATH += ../3rdparty/pdfium
+include(../3rdparty/pdfium.pri)
diff --git a/src/qpdf/qpdf.pro b/src/qpdf/qpdf.pro
index 47abc6a..337d955 100644
--- a/src/qpdf/qpdf.pro
+++ b/src/qpdf/qpdf.pro
@@ -1,11 +1,15 @@
TARGET = QtQPdf
QT = gui core network
TEMPLATE = lib
-CONFIG += c++11 warn_off
-VPATH += ../3rdparty/pdfium
+CONFIG += c++11
INCLUDEPATH += ../3rdparty/pdfium/fpdfsdk/include
-include(../3rdparty/pdfium.pri)
load(qt_module)
+LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpdfium$$qtPlatformTargetSuffix()
+
+gcc {
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
+}
+
SOURCES += \
jsbridge.cpp
diff --git a/src/src.pro b/src/src.pro
index 8c31508..d2216d4 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-SUBDIRS = 3rdparty qpdf
+SUBDIRS = 3rdparty lib qpdf