From 016a91c8ab4b7e8e0c2abca31a1df329e3ae184f Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 3 Jul 2024 15:45:37 +0200 Subject: [PATCH] Port away from deprecated API in Qt 6.6: QColor::setNamedColor The replacement, QColor::fromString() exists since Qt 6.4. --- QXlsx/CMakeLists.txt | 2 +- QXlsx/source/xlsxcolor.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt index e1a6cc5e..6362711e 100644 --- a/QXlsx/CMakeLists.txt +++ b/QXlsx/CMakeLists.txt @@ -147,7 +147,7 @@ target_compile_definitions(QXlsx PRIVATE QT_USE_QSTRINGBUILDER QT_NO_SIGNALS_SLOTS_KEYWORDS QT_USE_FAST_OPERATOR_PLUS - QT_DISABLE_DEPRECATED_BEFORE=0x060200 + QT_DISABLE_DEPRECATED_BEFORE=0x060600 ) if (NOT WIN32) diff --git a/QXlsx/source/xlsxcolor.cpp b/QXlsx/source/xlsxcolor.cpp index 1fee05d4..5fd87cdf 100644 --- a/QXlsx/source/xlsxcolor.cpp +++ b/QXlsx/source/xlsxcolor.cpp @@ -116,6 +116,13 @@ XlsxColor::operator QVariant() const QColor XlsxColor::fromARGBString(const QString &c) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) + if (c.startsWith(u'#')) { + return QColor::fromString(c); + } else { + return QColor::fromString(QLatin1Char('#') + c); + } +#else QColor color; if (c.startsWith(u'#')) { color.setNamedColor(c); @@ -123,6 +130,7 @@ QColor XlsxColor::fromARGBString(const QString &c) color.setNamedColor(QLatin1Char('#') + c); } return color; +#endif } QString XlsxColor::toARGBString(const QColor &c)