Do not add PDF-related files to the resources if PDF is disabled
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:
parent
71bbdc46d7
commit
d546ff93a5
@ -286,27 +286,28 @@ qt_internal_add_module(Gui
|
||||
)
|
||||
|
||||
# Resources:
|
||||
set_source_files_properties("../3rdparty/icc/sRGB2014.icc"
|
||||
PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc"
|
||||
)
|
||||
set(qpdf_resource_files
|
||||
"../3rdparty/icc/sRGB2014.icc"
|
||||
"painting/qpdfa_metadata.xml"
|
||||
)
|
||||
if(QT_FEATURE_pdf)
|
||||
set_source_files_properties("../3rdparty/icc/sRGB2014.icc"
|
||||
PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc"
|
||||
)
|
||||
set(qpdf_resource_files
|
||||
"../3rdparty/icc/sRGB2014.icc"
|
||||
"painting/qpdfa_metadata.xml"
|
||||
)
|
||||
qt_internal_add_resource(Gui "qpdf"
|
||||
PREFIX
|
||||
"/qpdf/"
|
||||
BASE
|
||||
"painting"
|
||||
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 "qpdf"
|
||||
PREFIX
|
||||
"/qpdf/"
|
||||
BASE
|
||||
"painting"
|
||||
FILES
|
||||
${qpdf_resource_files}
|
||||
)
|
||||
|
||||
qt_internal_add_resource(Gui "gui_shaders"
|
||||
PREFIX
|
||||
"/qt-project.org/gui"
|
||||
|
Loading…
x
Reference in New Issue
Block a user