diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-05-22 14:03:14 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-05-29 00:08:35 +0200 |
| commit | e9e2f9442ab88a853f511476e35efe8d15186c68 (patch) | |
| tree | 977abbae6b7da2982093254f0c052be0162dd985 | |
| parent | 626c46ab34b201cbec6c86b183d0047062d9bb76 (diff) | |
Add static linking for qpdf for all platforms
Change-Id: Ie222d56c52f5ca474809b2bc864618e5b3e9a1f2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/buildtools/configure.json | 1 | ||||
| -rw-r--r-- | src/pdf/pdfcore_generator.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 6c9f09286..1511bb059 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -392,7 +392,6 @@ && features.webengine-nowhitespace && features.webengine-arch-support && !features.webengine-no-platform-support - && (!config.static || config.ios) && (!config.linux || features.pkg-config) && (!config.win32 || features.webengine-winversion)", "output": [ "privateFeature" ] diff --git a/src/pdf/pdfcore_generator.pro b/src/pdf/pdfcore_generator.pro index c8eb13b81..e5c7258b7 100644 --- a/src/pdf/pdfcore_generator.pro +++ b/src/pdf/pdfcore_generator.pro @@ -3,7 +3,7 @@ qtConfig(debug_and_release): CONFIG += debug_and_release TARGET = QtPdf TEMPLATE = lib CONFIG = gn_generator $$CONFIG -ios: CONFIG -=static # note we still do static on ios when linking +CONFIG -=static # note we still do static when linking GN_SRC_DIR = $$PWD GN_FILE = $$OUT_PWD/$$getConfigDir()/BUILD.gn GN_FIND_MOCABLES_SCRIPT = $$shell_path($$QTWEBENGINE_ROOT/tools/scripts/gn_find_mocables.py) |