summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2014-12-14 12:51:38 +0100
committerMichal Klocek <michal.klocek@qt.io>2019-11-25 12:01:38 +0100
commit212a78fe75f59d4d0d580e0064991c7043785f3e (patch)
treebdd1e0efe787657f4a004c43a6501ed8f689d708
parent05ee93260993bf890072ae48191a2e30735571c4 (diff)
Re-organize the build system to turn this into a full-fledged module
-rw-r--r--qpdf.pro6
-rw-r--r--src/qpdf/gyp2pri.py (renamed from gyp2pri.py)0
-rw-r--r--src/qpdf/pdfium.pri (renamed from pdfium.pri)0
-rw-r--r--src/qpdf/qpdf.pro7
-rw-r--r--tests/auto/pdf/cmake/cmake.pro0
5 files changed, 8 insertions, 5 deletions
diff --git a/qpdf.pro b/qpdf.pro
index 9beab6f02..58c33f27c 100644
--- a/qpdf.pro
+++ b/qpdf.pro
@@ -1,5 +1 @@
-TEMPLATE = lib
-CONFIG += c++11 warn_off
-VPATH += src/3rdparty/pdfium
-linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
-include(pdfium.pri)
+load(qt_parts)
diff --git a/gyp2pri.py b/src/qpdf/gyp2pri.py
index af3f5237f..af3f5237f 100644
--- a/gyp2pri.py
+++ b/src/qpdf/gyp2pri.py
diff --git a/pdfium.pri b/src/qpdf/pdfium.pri
index c7f96a880..c7f96a880 100644
--- a/pdfium.pri
+++ b/src/qpdf/pdfium.pri
diff --git a/src/qpdf/qpdf.pro b/src/qpdf/qpdf.pro
new file mode 100644
index 000000000..653dab611
--- /dev/null
+++ b/src/qpdf/qpdf.pro
@@ -0,0 +1,7 @@
+TARGET = QtQPdf
+QT = gui core network
+TEMPLATE = lib
+CONFIG += c++11 warn_off
+VPATH += ../3rdparty/pdfium
+include(pdfium.pri)
+load(qt_module)
diff --git a/tests/auto/pdf/cmake/cmake.pro b/tests/auto/pdf/cmake/cmake.pro
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/auto/pdf/cmake/cmake.pro