diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-12-15 19:19:38 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-11-25 12:01:39 +0100 |
| commit | 788c80829c93fa17cdc1a24d911801eb0c58e15d (patch) | |
| tree | b5b9460fedde0601fc61284dc5b8aefb9df2a830 | |
| parent | b2b7503192cb6cb2f0c97a76a5320f710d2d6568 (diff) | |
replace relative directory paths to permit shadow builds
Change-Id: Ibf5bcb6671313e175a50a0caf452c747562da830
Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/lib/lib.pro | 8 | ||||
| -rw-r--r-- | src/pdf/pdf.pro | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/lib.pro b/src/lib/lib.pro index ca04bb3e9..8535a315e 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -8,11 +8,11 @@ load(qt_helper_lib) unix:!mac: CONFIG -= debug_and_release -VPATH += ../3rdparty/pdfium -VPATH += ../3rdparty/pdfium/third_party +VPATH += $$QTPDF_ROOT/src/3rdparty/pdfium +VPATH += $$QTPDF_ROOT/src/3rdparty/pdfium/third_party -system(python ../3rdparty/gyp2pri.py --gyp-var libjpeg_gyp_path=third_party/third_party.gyp --gyp-var pdf_use_skia=0 ../3rdparty/pdfium/pdfium.gyp pdfium $$OUT_PWD/pdfium.pri) -system(python ../3rdparty/gyp2pri.py ../3rdparty/pdfium/third_party/third_party.gyp fx_freetype $$OUT_PWD/freetype.pri) +system(python $$QTPDF_ROOT/src/3rdparty/gyp2pri.py --gyp-var libjpeg_gyp_path=third_party/third_party.gyp --gyp-var pdf_use_skia=0 $$QTPDF_ROOT/src/3rdparty/pdfium/pdfium.gyp pdfium $$OUT_PWD/pdfium.pri) +system(python $$QTPDF_ROOT/src/3rdparty/gyp2pri.py $$QTPDF_ROOT/src/3rdparty/pdfium/third_party/third_party.gyp fx_freetype $$OUT_PWD/freetype.pri) include($$OUT_PWD/pdfium.pri) diff --git a/src/pdf/pdf.pro b/src/pdf/pdf.pro index 8a1777f6d..1a467c5b2 100644 --- a/src/pdf/pdf.pro +++ b/src/pdf/pdf.pro @@ -5,9 +5,9 @@ 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 +INCLUDEPATH += $$QTPDF_ROOT/src/3rdparty/pdfium/fpdfsdk/include +INCLUDEPATH += $$QTPDF_ROOT/src/3rdparty/pdfium +INCLUDEPATH += $$QTPDF_ROOT/src/3rdparty/pdfium/third_party/freetype/include load(qt_module) LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqtpdfium$$qtPlatformTargetSuffix() |