Commit 18c6631c authored by Glen Ditchfield's avatar Glen Ditchfield 🐛
Browse files

Fix failed merge from Release/22.04

parent 7c165b31
Pipeline #166759 passed with stage
in 2 minutes and 52 seconds
......@@ -33,9 +33,13 @@ void KTimeZoneComboBoxPrivate::fillComboBox()
// Read all known time zones.
const QList<QByteArray> lstTimeZoneIds = QTimeZone::availableTimeZoneIds();
mZones.reserve(lstTimeZoneIds.count());
std::copy(lstTimeZoneIds.begin(), lstTimeZoneIds.end(), std::back_inserter(mZones));
std::sort(mZones.begin(), mZones.end()); // clazy:exclude=detaching-member
mZones.reserve(lstTimeZoneIds.count() + 3);
// Prepend the system time zone, UTC and Floating, for convenience.
mZones.append(QTimeZone::systemTimeZoneId());
mZones.append("Floating");
mZones.append("UTC");
const auto sortStart = mZones.end();
std::copy(lstTimeZoneIds.begin(), lstTimeZoneIds.end(), std::back_inserter(mZones));
std::sort(sortStart, mZones.end()); // clazy:exclude=detaching-member
......
Supports Markdown
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