Commit 224f7c8d authored by Laurent Montel's avatar Laurent Montel 😁

Make it compile with QT_NO_CAST_FROM_BYTEARRAY

parent 4c538d17
......@@ -58,7 +58,6 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX LIBKLEO
########### Targets ###########
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
remove_definitions( -DQT_NO_CAST_FROM_ASCII )
remove_definitions( -DQT_NO_CAST_TO_ASCII )
add_definitions( -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT )
......
......@@ -565,7 +565,7 @@ const Kleo::DNAttributeMapper *Kleo::DNAttributeMapper::instance()
QString Kleo::DNAttributeMapper::name2label(const QString &s) const
{
const std::map<const char *, const char *, ltstr>::const_iterator it
= d->map.find(s.trimmed().toUpper().toLatin1());
= d->map.find(s.trimmed().toUpper().toLatin1().constData());
if (it == d->map.end()) {
return QString();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment