File tree Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ target_compile_definitions(QXlsx PRIVATE
147
147
QT_USE_QSTRINGBUILDER
148
148
QT_NO_SIGNALS_SLOTS_KEYWORDS
149
149
QT_USE_FAST_OPERATOR_PLUS
150
- QT_DISABLE_DEPRECATED_BEFORE=0x060200
150
+ QT_DISABLE_DEPRECATED_BEFORE=0x060600
151
151
)
152
152
153
153
if (NOT WIN32 )
Original file line number Diff line number Diff line change @@ -116,13 +116,21 @@ XlsxColor::operator QVariant() const
116
116
117
117
QColor XlsxColor::fromARGBString (const QString &c)
118
118
{
119
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
120
+ if (c.startsWith (u' #' )) {
121
+ return QColor::fromString (c);
122
+ } else {
123
+ return QColor::fromString (QLatin1Char (' #' ) + c);
124
+ }
125
+ #else
119
126
QColor color;
120
127
if (c.startsWith (u' #' )) {
121
128
color.setNamedColor (c);
122
129
} else {
123
130
color.setNamedColor (QLatin1Char (' #' ) + c);
124
131
}
125
132
return color;
133
+ #endif
126
134
}
127
135
128
136
QString XlsxColor::toARGBString (const QColor &c)
You can’t perform that action at this time.
0 commit comments