1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not add PDF-related files to the resources if PDF is disabled

Browse Source 
This avoids added resources:

  ":/qpdf/qpdfa_metadata.xml"
  ":/qpdf/sRGB2014.icc"

Change-Id: I89a130bd281c5550f1c3dcead8336e0c3de6bc84
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 3d31b1953847e9b052812c8b7985d53af2c88385)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
André Klitzing 2024-02-27 13:03:34 +01:00 committed by Qt Cherry-pick Bot
parent 71bbdc46d7
commit d546ff93a5
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/CMakeLists.txt
View File

@ -286,6 +286,7 @@ qt_internal_add_module(Gui
) )
# Resources: # Resources:
if(QT_FEATURE_pdf)
set_source_files_properties("../3rdparty/icc/sRGB2014.icc" set_source_files_properties("../3rdparty/icc/sRGB2014.icc"
PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc" PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc"
) )
@ -293,11 +294,6 @@ set(qpdf_resource_files
"../3rdparty/icc/sRGB2014.icc" "../3rdparty/icc/sRGB2014.icc"
"painting/qpdfa_metadata.xml" "painting/qpdfa_metadata.xml"
) )
if(WIN32 OR (UNIX AND NOT APPLE))
set_target_properties(Gui PROPERTIES UNITY_BUILD OFF) # X11 define clashes/Windows oddities.
endif()
qt_internal_add_resource(Gui "qpdf" qt_internal_add_resource(Gui "qpdf"
PREFIX PREFIX
"/qpdf/" "/qpdf/"
@ -306,6 +302,11 @@ qt_internal_add_resource(Gui "qpdf"
FILES FILES
${qpdf_resource_files} ${qpdf_resource_files}
) )
endif()
if(WIN32 OR (UNIX AND NOT APPLE))
set_target_properties(Gui PROPERTIES UNITY_BUILD OFF) # X11 define clashes/Windows oddities.
endif()
qt_internal_add_resource(Gui "gui_shaders" qt_internal_add_resource(Gui "gui_shaders"
PREFIX PREFIX