From 2f2fbddc9fc14af8adea512662b09d020883641c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 15 Aug 2025 15:16:33 +0200 Subject: [PATCH] Build qiiofhelpers.cpp in Objective-C++ mode Working with helpers from Foundation simplifies things down the line. Pick-to: 6.10 Change-Id: I9b6bb94e360c4fd60f308e97fc02af1840e5aeea Reviewed-by: Volker Hilsheimer --- src/plugins/imageformats/macheif/CMakeLists.txt | 2 +- src/plugins/imageformats/macjp2/CMakeLists.txt | 2 +- .../imageformats/shared/{qiiofhelpers.cpp => qiiofhelpers.mm} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/plugins/imageformats/shared/{qiiofhelpers.cpp => qiiofhelpers.mm} (100%) diff --git a/src/plugins/imageformats/macheif/CMakeLists.txt b/src/plugins/imageformats/macheif/CMakeLists.txt index 6ceee54d..44fe3bd7 100644 --- a/src/plugins/imageformats/macheif/CMakeLists.txt +++ b/src/plugins/imageformats/macheif/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QMacHeifPlugin OUTPUT_NAME qmacheif PLUGIN_TYPE imageformats SOURCES - ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h + ../shared/qiiofhelpers.mm ../shared/qiiofhelpers_p.h main.cpp qmacheifhandler.cpp qmacheifhandler.h INCLUDE_DIRECTORIES diff --git a/src/plugins/imageformats/macjp2/CMakeLists.txt b/src/plugins/imageformats/macjp2/CMakeLists.txt index dab50e55..4079b7c6 100644 --- a/src/plugins/imageformats/macjp2/CMakeLists.txt +++ b/src/plugins/imageformats/macjp2/CMakeLists.txt @@ -9,7 +9,7 @@ qt_internal_add_plugin(QMacJp2Plugin OUTPUT_NAME qmacjp2 PLUGIN_TYPE imageformats SOURCES - ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h + ../shared/qiiofhelpers.mm ../shared/qiiofhelpers_p.h main.cpp qmacjp2handler.cpp qmacjp2handler.h INCLUDE_DIRECTORIES diff --git a/src/plugins/imageformats/shared/qiiofhelpers.cpp b/src/plugins/imageformats/shared/qiiofhelpers.mm similarity index 100% rename from src/plugins/imageformats/shared/qiiofhelpers.cpp rename to src/plugins/imageformats/shared/qiiofhelpers.mm