diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-07-20 15:56:14 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-07-23 15:13:08 +0200 |
| commit | 74fe796039e85c97ffac3f7b014ca718e7284dea (patch) | |
| tree | 2ae017494833c923bcf1489dd3dfa29bcb888d60 /src/pdf/pdfcore.pro | |
| parent | 6178015dff6f2f83c16a1dddb199c7f6c3e9c694 (diff) | |
Share linking config between webenginecore and pdf
Change-Id: Ib06a0a1ec3372d483008cc0ac0ec211ec8316e0e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/pdf/pdfcore.pro')
| -rw-r--r-- | src/pdf/pdfcore.pro | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/pdf/pdfcore.pro b/src/pdf/pdfcore.pro index df9c67232..2dfe39dc0 100644 --- a/src/pdf/pdfcore.pro +++ b/src/pdf/pdfcore.pro @@ -17,33 +17,6 @@ INCLUDEPATH += $$QTWEBENGINE_ROOT/src/pdf \ DEFINES += QT_BUILD_PDF_LIB win32: DEFINES += NOMINMAX -linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri -!include($$linking_pri) { - error("Could not find the linking information that gn should have generated.") -} - -isEmpty(NINJA_OBJECTS): error("Missing object files from QtPdf linking pri.") -isEmpty(NINJA_LFLAGS): error("Missing linker flags from QtPdf linking pri") -isEmpty(NINJA_LIBS): error("Missing library files from QtPdf linking pri") - -NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS)) -RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp -for(object, NINJA_OBJECTS): RSP_CONTENT += $$object -write_file($$RSP_FILE, RSP_CONTENT) - -macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE) -linux:LIBS_PRIVATE += @$$RSP_FILE - -# QTBUG-58710 add main rsp file on windows -win32:QMAKE_LFLAGS += @$$RSP_FILE - -!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 - QMAKE_DOCS = $$PWD/doc/qtpdf.qdocconf gcc { @@ -54,7 +27,7 @@ msvc { QMAKE_CXXFLAGS_WARN_ON += -wd"4100" } -ios: OBJECTS += $$NINJA_OBJECTS +include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri) # install static dependencies and handle prl files for static builds |