From 3d22e15a3f1a54427b870e4df97e3898fe8c8339 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 30 Jan 2020 14:42:25 +0100 Subject: FIXUP: Fix qptdf build with system icu When doing qtpdf build with system icu we might get no static libs. Update checks and remove unnecessary CONFIG lines from pdf core. Change-Id: Ia9e1944b4931d47f2efca58418f430bad800b29f Reviewed-by: Allan Sandfeld Jensen --- src/pdf/pdfcore.pro | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/pdf/pdfcore.pro') diff --git a/src/pdf/pdfcore.pro b/src/pdf/pdfcore.pro index 1f9f21e0a..812b7fc14 100644 --- a/src/pdf/pdfcore.pro +++ b/src/pdf/pdfcore.pro @@ -6,9 +6,6 @@ QT_PRIVATE += network TEMPLATE = lib -CONFIG += c++11 -CONFIG -= precompile_header # Not supported by upstream header files - INCLUDEPATH += $$QTWEBENGINE_ROOT/src/pdf CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir() CHROMIUM_GEN_DIR = $$OUT_PWD/../$$getConfigDir()/gen @@ -27,7 +24,6 @@ linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri isEmpty(NINJA_OBJECTS): error("Missing object files from QtPdf linking pri.") isEmpty(NINJA_LFLAGS): error("Missing linker flags from QtPdf linking pri") -isEmpty(NINJA_ARCHIVES): error("Missing archive files from QtPdf linking pri") isEmpty(NINJA_LIBS): error("Missing library files from QtPdf linking pri") NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS)) @@ -41,8 +37,10 @@ linux:LIBS_PRIVATE += @$$RSP_FILE # QTBUG-58710 add main rsp file on windows win32:QMAKE_LFLAGS += @$$RSP_FILE -linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group -else: LIBS_PRIVATE += $$NINJA_ARCHIVES +!isEmpty(NINJA_ARCHIVES) { + linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group + else: LIBS_PRIVATE += $$NINJA_ARCHIVES +} LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS -- cgit v1.2.3